From 9eb43a50b89f844ae0c1ac23f5d81d6fa816b8eb Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Fri, 19 Nov 2021 11:03:10 -0800
Subject: [PATCH 01/87] Add json-rpc dependency

---
 requirements.in  | 3 +++
 requirements.txt | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/requirements.in b/requirements.in
index cf488dd47758..6ed7315cf018 100644
--- a/requirements.in
+++ b/requirements.in
@@ -5,3 +5,6 @@
 
 # Sort Imports
 isort==5.10.0
+
+# Test adapter
+json-rpc==1.13.0
diff --git a/requirements.txt b/requirements.txt
index 91541236262d..41ce0d64b28b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with python 3.6
+# This file is autogenerated by pip-compile
 # To update, run:
 #
 #    pip-compile --generate-hashes requirements.in
@@ -8,3 +8,7 @@ isort==5.10.0 \
     --hash=sha256:1a18ccace2ed8910bd9458b74a3ecbafd7b2f581301b0ab65cfdd4338272d76f \
     --hash=sha256:e52ff6d38012b131628cf0f26c51e7bd3a7c81592eefe3ac71411e692f1b9345
     # via -r requirements.in
+json-rpc==1.13.0 \
+    --hash=sha256:84b45058e5ba95f49c7b6afcf7e03ab86bee89bf2c01f3ad8dd41fe114fc1f84 \
+    --hash=sha256:def0dbcf5b7084fc31d677f2f5990d988d06497f2f47f13024274cfb2d5d7589
+    # via -r requirements.in

From 35a359ea00fb258d3988d487908f02f4e2d7da3e Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Thu, 25 Nov 2021 16:42:44 -0800
Subject: [PATCH 02/87] Basic test discovery (no server yet)

---
 pythonFiles/unittestadapter/discovery.py | 113 +++++++++++++++++++++++
 1 file changed, 113 insertions(+)
 create mode 100644 pythonFiles/unittestadapter/discovery.py

diff --git a/pythonFiles/unittestadapter/discovery.py b/pythonFiles/unittestadapter/discovery.py
new file mode 100644
index 000000000000..fb493ffdc2bf
--- /dev/null
+++ b/pythonFiles/unittestadapter/discovery.py
@@ -0,0 +1,113 @@
+import getopt
+import inspect
+import json
+import os
+import sys
+import traceback
+import unittest
+
+from jsonrpc import JSONRPCResponseManager, dispatcher
+
+sys.path.insert(0, os.getcwd())
+
+# Get arguments: -v, -s, -p, -t in that order
+argv = sys.argv[1:]
+opts, args = getopt.getopt(argv, "vs:p:t:")
+
+pattern = "test*.py"
+top_level_dir = None
+
+for opt in opts:
+    if opt[0] == "-s":
+        start_dir = opt[1]
+    elif opt[0] == "-p":
+        pattern = opt[1]
+    elif opt[0] == "-t":
+        top_level_dir = opt[1]
+
+# Helper functions
+def get_test_cases(suite):
+    for test in suite:
+        if isinstance(test, unittest.TestCase):
+            yield test
+        else:
+            for test_case in get_test_cases(test):
+                yield test_case
+
+
+def get_source_line(obj):
+    try:
+        sourcelines, lineno = inspect.getsourcelines(obj)
+    except:
+        try:
+            sourcelines, lineno = inspect.getsourcelines(obj.orig_method)
+        except:
+            return "*"
+
+    # Return the line number of the first line of the test case definition.
+    for i, v in enumerate(sourcelines):
+        if v.strip().startswith(("def", "async def")):
+            return str(lineno + i)
+    return "*"
+
+
+# Test discovery
+payload = {"command": " ".join(sys.argv[:]), "cwd": os.getcwd()}
+tests = []
+
+try:
+    loader = unittest.TestLoader()
+    suite = loader.discover(start_dir, pattern, top_level_dir)
+    loader_errors = []
+
+    for test in get_test_cases(suite):
+        test_id = test.id()
+        test_method = getattr(test, test._testMethodName)
+        lineno = get_source_line(test_method)
+
+        # Build payload
+        if test_id.startswith("unittest.loader._FailedTest"):
+            loader_errors.append(test._exception.__str__())
+        else:
+            tests.append({"id": test_id, "lineno": lineno})
+except:
+    payload["status"] = "error"
+    payload["errors"] = [traceback.format_exc()]
+
+if len(tests):
+    payload["tests"] = tests
+
+if len(loader_errors):
+    payload["errors"] = loader_errors
+
+print(json.dumps(payload))
+# Send payload with results
+# r = requests.post("http://localhost:8080/", json=payload)
+# print(r.text)
+
+
+# Message formatting:
+#
+# Successful discovery:
+# {
+#     "command": <script execution command>
+#     "cwd": <current working directory>
+#     "status": "success",
+#     "tests":[
+#         {
+#           "id": <test id>,
+#           "lineno": <source line>,
+#           "params": <parameters> # In case of subtests
+#         },
+#         ...
+#     ]
+# }
+#
+# Error:
+# {
+#     "command": <script execution command string>
+#     "cwd": <current working directory>
+#     "errors": [list of errors]
+#     "status": "error",
+# }
+#

From 4eac7cf2c2e173303ce19a948f604d9d2951a542 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Sat, 27 Nov 2021 15:24:08 -0800
Subject: [PATCH 03/87] Remove json-rpc dependency

---
 requirements.in  | 3 ---
 requirements.txt | 4 ----
 2 files changed, 7 deletions(-)

diff --git a/requirements.in b/requirements.in
index 6ed7315cf018..cf488dd47758 100644
--- a/requirements.in
+++ b/requirements.in
@@ -5,6 +5,3 @@
 
 # Sort Imports
 isort==5.10.0
-
-# Test adapter
-json-rpc==1.13.0
diff --git a/requirements.txt b/requirements.txt
index 41ce0d64b28b..9787fd0cf9fa 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,3 @@ isort==5.10.0 \
     --hash=sha256:1a18ccace2ed8910bd9458b74a3ecbafd7b2f581301b0ab65cfdd4338272d76f \
     --hash=sha256:e52ff6d38012b131628cf0f26c51e7bd3a7c81592eefe3ac71411e692f1b9345
     # via -r requirements.in
-json-rpc==1.13.0 \
-    --hash=sha256:84b45058e5ba95f49c7b6afcf7e03ab86bee89bf2c01f3ad8dd41fe114fc1f84 \
-    --hash=sha256:def0dbcf5b7084fc31d677f2f5990d988d06497f2f47f13024274cfb2d5d7589
-    # via -r requirements.in

From 2adac64e66567c70c2931989b27c9c3e9ed95fb0 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Sun, 28 Nov 2021 22:17:26 -0800
Subject: [PATCH 04/87] Clean up test discovery script

---
 pythonFiles/unittestadapter/discovery.py | 69 +++++++++++++++---------
 1 file changed, 45 insertions(+), 24 deletions(-)

diff --git a/pythonFiles/unittestadapter/discovery.py b/pythonFiles/unittestadapter/discovery.py
index fb493ffdc2bf..010ef68a4284 100644
--- a/pythonFiles/unittestadapter/discovery.py
+++ b/pythonFiles/unittestadapter/discovery.py
@@ -1,29 +1,53 @@
 import getopt
 import inspect
-import json
 import os
+import requests
 import sys
 import traceback
 import unittest
 
-from jsonrpc import JSONRPCResponseManager, dispatcher
-
 sys.path.insert(0, os.getcwd())
 
-# Get arguments: -v, -s, -p, -t in that order
+# Get arguments
 argv = sys.argv[1:]
-opts, args = getopt.getopt(argv, "vs:p:t:")
+index = argv.index("--")
+
+script_args, _ = getopt.getopt(argv[:index], "", ["port="])
+unittest_args, _ = getopt.getopt(
+    argv[index + 1 :],
+    "vs:p:t:",
+    ["start-directory=", "pattern=", "top-level-directory="],
+)
+
+
+# Parse command-line arguments that should be processed by the script,
+# for example the port number that it needs to connect to.
+def parse_script_args(args):
+    # The port is passed to the discovery.py script when it is executed,
+    # defaults to 45454 if it can't be parsed.
+    port = 45454
+    for opt in args:
+        if opt[0] == "--port":
+            port = opt[1]
+    return port
+
+
+# Parse command-line arguments that should be forwarded to unittest.
+# Unittest arguments are: -v, -s, -p, -t, in that order.
+def parse_unittest_args(args):
+    pattern = "test*.py"
+    top_level_dir = None
+
+    for opt in args:
+        if opt[0] == "-s":
+            start_dir = opt[1]
+        elif opt[0] == "-p":
+            pattern = opt[1]
+        elif opt[0] == "-t":
+            top_level_dir = opt[1]
 
-pattern = "test*.py"
-top_level_dir = None
+    return start_dir, pattern, top_level_dir
 
-for opt in opts:
-    if opt[0] == "-s":
-        start_dir = opt[1]
-    elif opt[0] == "-p":
-        pattern = opt[1]
-    elif opt[0] == "-t":
-        top_level_dir = opt[1]
 
 # Helper functions
 def get_test_cases(suite):
@@ -52,7 +76,8 @@ def get_source_line(obj):
 
 
 # Test discovery
-payload = {"command": " ".join(sys.argv[:]), "cwd": os.getcwd()}
+start_dir, pattern, top_level_dir = parse_unittest_args(unittest_args)
+payload = {"cwd": os.path.abspath(start_dir)}
 tests = []
 
 try:
@@ -80,24 +105,21 @@ def get_source_line(obj):
 if len(loader_errors):
     payload["errors"] = loader_errors
 
-print(json.dumps(payload))
-# Send payload with results
-# r = requests.post("http://localhost:8080/", json=payload)
-# print(r.text)
+# Connect to the TypeScript side and send payload.
+port = parse_script_args(script_args)
+requests.post(f"http://localhost:{port}", json=payload)
 
 
 # Message formatting:
 #
 # Successful discovery:
 # {
-#     "command": <script execution command>
-#     "cwd": <current working directory>
+#     "cwd": <test discovery directory>
 #     "status": "success",
 #     "tests":[
 #         {
 #           "id": <test id>,
 #           "lineno": <source line>,
-#           "params": <parameters> # In case of subtests
 #         },
 #         ...
 #     ]
@@ -105,8 +127,7 @@ def get_source_line(obj):
 #
 # Error:
 # {
-#     "command": <script execution command string>
-#     "cwd": <current working directory>
+#     "cwd": <test discovery directory>
 #     "errors": [list of errors]
 #     "status": "error",
 # }

From cb7ce85cb17127d63e714b964503fdc2d95526f1 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Sun, 28 Nov 2021 23:00:07 -0800
Subject: [PATCH 05/87] Add default test results array value (py side)

---
 pythonFiles/unittestadapter/discovery.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pythonFiles/unittestadapter/discovery.py b/pythonFiles/unittestadapter/discovery.py
index 010ef68a4284..53ad5cd56c92 100644
--- a/pythonFiles/unittestadapter/discovery.py
+++ b/pythonFiles/unittestadapter/discovery.py
@@ -99,8 +99,7 @@ def get_source_line(obj):
     payload["status"] = "error"
     payload["errors"] = [traceback.format_exc()]
 
-if len(tests):
-    payload["tests"] = tests
+payload["tests"] = tests
 
 if len(loader_errors):
     payload["errors"] = loader_errors

From 5746990a13d57e8846cc67385f7b9a7aad3d73fe Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Sun, 28 Nov 2021 23:00:32 -0800
Subject: [PATCH 06/87] Add localization

---
 package.nls.json                    | 4 ++++
 src/client/common/utils/localize.ts | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/package.nls.json b/package.nls.json
index 1e980bdaaa9c..a3a6ffdd8e2f 100644
--- a/package.nls.json
+++ b/package.nls.json
@@ -68,6 +68,7 @@
     "Common.moreInfo": "More Info",
     "Common.and": "and",
     "Common.ok": "Ok",
+    "Common.error": "Error",
     "Common.install": "Install",
     "Common.learnMore": "Learn more",
     "Common.reportThisIssue": "Report this issue",
@@ -164,6 +165,9 @@
     "debug.pyramidEnterDevelopmentIniPathInvalidFilePathError": "Enter a valid file path",
     "Testing.configureTests": "Configure Test Framework",
     "Testing.testNotConfigured": "No test framework configured.",
+    "Testing.cancelUnittestDiscovery": "Canceled unittest test discovery",
+    "Testing.errorUnittestDiscovery": "Unittest test discovery error",
+    "Testing.seePythonOutput": "(see Output > Python)",
     "Common.openOutputPanel": "Show output",
     "LanguageService.statusItem.name": "Python IntelliSense Status",
     "LanguageService.statusItem.text": "Partial Mode",
diff --git a/src/client/common/utils/localize.ts b/src/client/common/utils/localize.ts
index 1b245a896f89..af84e9ca8181 100644
--- a/src/client/common/utils/localize.ts
+++ b/src/client/common/utils/localize.ts
@@ -78,6 +78,7 @@ export namespace Common {
     export const canceled = localize('Common.canceled', 'Canceled');
     export const cancel = localize('Common.cancel', 'Cancel');
     export const ok = localize('Common.ok', 'Ok');
+    export const error = localize('Common.error', 'Error');
     export const gotIt = localize('Common.gotIt', 'Got it!');
     export const install = localize('Common.install', 'Install');
     export const loadingExtension = localize('Common.loadingPythonExtension', 'Python extension loading...');
@@ -528,6 +529,12 @@ export namespace DebugConfigStrings {
 export namespace Testing {
     export const configureTests = localize('Testing.configureTests', 'Configure Test Framework');
     export const testNotConfigured = localize('Testing.testNotConfigured', 'No test framework configured.');
+    export const cancelUnittestDiscovery = localize(
+        'Testing.cancelUnittestDiscovery',
+        'Canceled unittest test discovery',
+    );
+    export const errorUnittestDiscovery = localize('Testing.errorUnittestDiscovery', 'Unittest test discovery error');
+    export const seePythonOutput = localize('Testing.seePythonOutput', '(see Output > Python)');
 }
 
 export namespace OutdatedDebugger {

From 52785d695c83446b59d45093825151eb5384db74 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Wed, 15 Dec 2021 14:52:34 -0800
Subject: [PATCH 07/87] Build tree on the Python side + move utils out

---
 pythonFiles/unittestadapter/discovery.py | 122 +++++----------
 pythonFiles/unittestadapter/utils.py     | 185 +++++++++++++++++++++++
 2 files changed, 221 insertions(+), 86 deletions(-)
 create mode 100644 pythonFiles/unittestadapter/utils.py

diff --git a/pythonFiles/unittestadapter/discovery.py b/pythonFiles/unittestadapter/discovery.py
index 53ad5cd56c92..da1280641887 100644
--- a/pythonFiles/unittestadapter/discovery.py
+++ b/pythonFiles/unittestadapter/discovery.py
@@ -1,11 +1,13 @@
 import getopt
-import inspect
 import os
+from typing import Any, List, Tuple
 import requests
 import sys
 import traceback
 import unittest
 
+from utils import TestNode, build_test_tree
+
 sys.path.insert(0, os.getcwd())
 
 # Get arguments
@@ -19,10 +21,14 @@
     ["start-directory=", "pattern=", "top-level-directory="],
 )
 
+Arguments = Tuple[str, Any]
+
 
-# Parse command-line arguments that should be processed by the script,
-# for example the port number that it needs to connect to.
-def parse_script_args(args):
+def parse_port(args: List[Arguments]) -> int:
+    """
+    Parse command-line arguments that should be processed by the script,
+    for example the port number that it needs to connect to.
+    """
     # The port is passed to the discovery.py script when it is executed,
     # defaults to 45454 if it can't be parsed.
     port = 45454
@@ -32,9 +38,11 @@ def parse_script_args(args):
     return port
 
 
-# Parse command-line arguments that should be forwarded to unittest.
-# Unittest arguments are: -v, -s, -p, -t, in that order.
-def parse_unittest_args(args):
+def parse_unittest_args(args: List[Arguments]) -> Tuple[str, str, str]:
+    """
+    Parse command-line arguments that should be forwarded to unittest.
+    Unittest arguments are: -v, -s, -p, -t, in that order.
+    """
     pattern = "test*.py"
     top_level_dir = None
 
@@ -49,85 +57,27 @@ def parse_unittest_args(args):
     return start_dir, pattern, top_level_dir
 
 
-# Helper functions
-def get_test_cases(suite):
-    for test in suite:
-        if isinstance(test, unittest.TestCase):
-            yield test
-        else:
-            for test_case in get_test_cases(test):
-                yield test_case
+if __name__ == "__main__":
+    # Test discovery
+    start_dir, pattern, top_level_dir = parse_unittest_args(unittest_args)
+    cwd = os.path.abspath(start_dir)
+    payload = {"cwd": cwd}
+    tests: TestNode = {}
 
-
-def get_source_line(obj):
     try:
-        sourcelines, lineno = inspect.getsourcelines(obj)
+        loader = unittest.TestLoader()
+        suite = loader.discover(start_dir, pattern, top_level_dir)
+
+        tests, errors = build_test_tree(suite, cwd)
     except:
-        try:
-            sourcelines, lineno = inspect.getsourcelines(obj.orig_method)
-        except:
-            return "*"
-
-    # Return the line number of the first line of the test case definition.
-    for i, v in enumerate(sourcelines):
-        if v.strip().startswith(("def", "async def")):
-            return str(lineno + i)
-    return "*"
-
-
-# Test discovery
-start_dir, pattern, top_level_dir = parse_unittest_args(unittest_args)
-payload = {"cwd": os.path.abspath(start_dir)}
-tests = []
-
-try:
-    loader = unittest.TestLoader()
-    suite = loader.discover(start_dir, pattern, top_level_dir)
-    loader_errors = []
-
-    for test in get_test_cases(suite):
-        test_id = test.id()
-        test_method = getattr(test, test._testMethodName)
-        lineno = get_source_line(test_method)
-
-        # Build payload
-        if test_id.startswith("unittest.loader._FailedTest"):
-            loader_errors.append(test._exception.__str__())
-        else:
-            tests.append({"id": test_id, "lineno": lineno})
-except:
-    payload["status"] = "error"
-    payload["errors"] = [traceback.format_exc()]
-
-payload["tests"] = tests
-
-if len(loader_errors):
-    payload["errors"] = loader_errors
-
-# Connect to the TypeScript side and send payload.
-port = parse_script_args(script_args)
-requests.post(f"http://localhost:{port}", json=payload)
-
-
-# Message formatting:
-#
-# Successful discovery:
-# {
-#     "cwd": <test discovery directory>
-#     "status": "success",
-#     "tests":[
-#         {
-#           "id": <test id>,
-#           "lineno": <source line>,
-#         },
-#         ...
-#     ]
-# }
-#
-# Error:
-# {
-#     "cwd": <test discovery directory>
-#     "errors": [list of errors]
-#     "status": "error",
-# }
-#
+        payload["status"] = "error"
+        payload["errors"] = [traceback.format_exc()]
+
+    payload["tests"] = tests
+
+    if len(errors):
+        payload["errors"] = errors
+
+    # Connect to the TypeScript side and send payload.
+    port = parse_port(script_args)
+    requests.post(f"http://localhost:{port}", json=payload)
diff --git a/pythonFiles/unittestadapter/utils.py b/pythonFiles/unittestadapter/utils.py
new file mode 100644
index 000000000000..e667b592e965
--- /dev/null
+++ b/pythonFiles/unittestadapter/utils.py
@@ -0,0 +1,185 @@
+from enum import Enum
+import inspect
+import pathlib
+from typing import List, Tuple, TypedDict
+import unittest
+
+# Types
+
+
+class TestNodeTypeEnum(str, Enum):
+    class_ = "class"
+    file = "file"
+    folder = "folder"
+    test = "test"
+
+
+class TestData(TypedDict):
+    name: str
+    path: str
+    type_: TestNodeTypeEnum
+
+
+class TestItem(TestData):
+    id_: str
+    lineno: str
+
+
+class TestNode(TestData):
+    children: "List[TestNode | TestItem]"
+
+
+# Helper functions for data retrieval.
+
+
+def get_test_case(suite):
+    """
+    Iterate through a unittest test suite and return all test cases.
+    """
+    for test in suite:
+        if isinstance(test, unittest.TestCase):
+            yield test
+        else:
+            for test_case in get_test_case(test):
+                yield test_case
+
+
+def get_source_line(obj) -> str:
+    """
+    Get the line number of a test case start line.
+    """
+    try:
+        sourcelines, lineno = inspect.getsourcelines(obj)
+    except:
+        try:
+            sourcelines, lineno = inspect.getsourcelines(obj.orig_method)
+        except:
+            return "*"
+
+    # Return the line number of the first line of the test case definition.
+    for i, v in enumerate(sourcelines):
+        if v.strip().startswith(("def", "async def")):
+            return str(lineno + i)
+    return "*"
+
+
+# Helper functions for test tree building.
+
+
+def build_test_node(path: str, name: str, type: TestNodeTypeEnum) -> TestNode:
+    """
+    Build a test node with no children. A test node can be a folder, a file or a class.
+    """
+    return {
+        "path": path,
+        "name": name,
+        "type": type,
+        "children": [],
+    }
+
+
+def find_child_node(name: str, type: TestNodeTypeEnum, root: TestNode) -> TestNode:
+    """
+    Find a child node in a test tree given its name and type.
+    """
+    try:
+        result = next(
+            node
+            for node in root["children"]
+            if node["name"] == name and node["type"] == type
+        )
+    except StopIteration:
+        result = build_test_node(f'{root["path"]}/{name}', name, type)
+        root["children"].append(result)
+
+    return result
+
+
+def build_test_tree(
+    suite: unittest.TestSuite, test_directory: str
+) -> Tuple[TestNode, List[str]]:
+    """
+    Build a test tree from a unittest test suite.
+
+    Payload format for a successful discovery:
+    {
+        "status": "success",
+        "cwd": <test discovery directory>,
+        "tests": [
+            {
+                "path": <file or folder path>,
+                "type": "file" or "folder",
+                "name": <file or folder name>,
+                "children": [
+                    { files and folders }
+                    {
+                        "path": <file or folder path>,
+                        "name": <test name>,
+                        "type": "test",
+                        "lineno": <line number>
+                        "id": <test case id>,
+                    }
+                ]
+            }
+        ]
+    }
+
+    Payload format when there are errors:
+    {
+        "cwd": <test discovery directory>
+        "errors": [list of errors]
+        "status": "error",
+    }
+
+
+    """
+
+    errors = []
+    directory_path = pathlib.PurePath(test_directory)
+    root = build_test_node(test_directory, directory_path.name, TestNodeTypeEnum.folder)
+
+    for test_case in get_test_case(suite):
+        test_id = test_case.id()
+        if test_id.startswith("unittest.loader._FailedTest"):
+            errors.append(test_case._exception.__str__())
+        else:
+            # Get test path components
+            folders = test_id.split(".")
+            function_name = folders.pop()
+            class_name = folders.pop()
+            filename = folders.pop()
+            py_filename = f"{filename}.py"
+
+            current_node = root
+
+            # Find/build folder nodes
+            for folder in folders:
+                current_node = find_child_node(
+                    folder, TestNodeTypeEnum.folder, current_node
+                )
+
+            # Find/build file node
+            current_node = find_child_node(
+                py_filename, TestNodeTypeEnum.file, current_node
+            )
+
+            # Find/build class node
+            current_node = find_child_node(
+                class_name, TestNodeTypeEnum.class_, current_node
+            )
+
+            # Get test line number
+            test_method = getattr(test_case, test_case._testMethodName)
+            lineno = get_source_line(test_method)
+
+            # Add test
+            test_node: TestItem = {
+                "id_": test_id,
+                "name": function_name,
+                "path": f'{current_node["path"]}/{function_name}',
+                "lineno": lineno,
+                "type_": TestNodeTypeEnum.test,
+            }
+            current_node["children"].append(test_node)
+
+    return root, errors

From 9e9a9665313cd4d8b5b1d15f5a31d91d24f55f40 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Wed, 15 Dec 2021 15:35:02 -0800
Subject: [PATCH 08/87] Fix comments

---
 pythonFiles/unittestadapter/discovery.py | 15 ++++++++
 pythonFiles/unittestadapter/utils.py     | 44 ++++++++++++------------
 2 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/pythonFiles/unittestadapter/discovery.py b/pythonFiles/unittestadapter/discovery.py
index da1280641887..6e2406ff5a47 100644
--- a/pythonFiles/unittestadapter/discovery.py
+++ b/pythonFiles/unittestadapter/discovery.py
@@ -79,5 +79,20 @@ def parse_unittest_args(args: List[Arguments]) -> Tuple[str, str, str]:
         payload["errors"] = errors
 
     # Connect to the TypeScript side and send payload.
+
+    # Payload format for a successful discovery:
+    # {
+    #     "status": "success",
+    #     "cwd": <test discovery directory>,
+    #     "tests": <test tree>
+    # }
+
+    # Payload format when there are errors:
+    # {
+    #     "cwd": <test discovery directory>
+    #     "errors": [list of errors]
+    #     "status": "error",
+    # }
+
     port = parse_port(script_args)
     requests.post(f"http://localhost:{port}", json=payload)
diff --git a/pythonFiles/unittestadapter/utils.py b/pythonFiles/unittestadapter/utils.py
index e667b592e965..077411af3b2d 100644
--- a/pythonFiles/unittestadapter/utils.py
+++ b/pythonFiles/unittestadapter/utils.py
@@ -101,37 +101,37 @@ def build_test_tree(
     """
     Build a test tree from a unittest test suite.
 
-    Payload format for a successful discovery:
+    Test tree structure:
     {
-        "status": "success",
-        "cwd": <test discovery directory>,
-        "tests": [
+        "path": <test_directory path>,
+        "type": "folder",
+        "name": <folder name>,
+        "children": [
+            { files and folders }
+            ...
             {
-                "path": <file or folder path>,
-                "type": "file" or "folder",
-                "name": <file or folder name>,
+                "path": <file path>,
+                "name": filename.py,
+                "type": "file",
                 "children": [
-                    { files and folders }
                     {
-                        "path": <file or folder path>,
-                        "name": <test name>,
-                        "type": "test",
-                        "lineno": <line number>
-                        "id": <test case id>,
+                        "path": <class path>,
+                        "name": <class name>,
+                        "type": "class",
+                        "children": [
+                            {
+                                "path": <test path>,
+                                "name": <test name>,
+                                "type": "test",
+                                "lineno": <line number>
+                                "id": <test case id>,
+                            }
+                        ]
                     }
                 ]
             }
         ]
     }
-
-    Payload format when there are errors:
-    {
-        "cwd": <test discovery directory>
-        "errors": [list of errors]
-        "status": "error",
-    }
-
-
     """
 
     errors = []

From 95b7f7c0c0ff2193f828c92741b44f9a92d5ab86 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Wed, 15 Dec 2021 16:27:43 -0800
Subject: [PATCH 09/87] Basic test discovery

---
 pythonFiles/unittestadapter/discovery.py      |  10 +-
 pythonFiles/unittestadapter/utils.py          |  26 ++-
 src/client/testing/common/types.ts            |   4 +
 .../testController/common/commandRunner.ts    |  68 ++++++
 .../common/testItemUtilities.ts               |   7 +-
 .../testing/testController/common/types.ts    |  36 +++
 .../testing/testController/common/utils.ts    |   2 +
 .../testing/testController/controller.ts      |   8 +-
 .../unittest/testDiscoveryAdapter.ts          |  44 ++++
 .../testController/workspaceTestAdapter.ts    | 214 ++++++++++++++++++
 10 files changed, 401 insertions(+), 18 deletions(-)
 create mode 100644 src/client/testing/testController/common/commandRunner.ts
 create mode 100644 src/client/testing/testController/unittest/testDiscoveryAdapter.ts
 create mode 100644 src/client/testing/testController/workspaceTestAdapter.ts

diff --git a/pythonFiles/unittestadapter/discovery.py b/pythonFiles/unittestadapter/discovery.py
index 6e2406ff5a47..17995c0462a2 100644
--- a/pythonFiles/unittestadapter/discovery.py
+++ b/pythonFiles/unittestadapter/discovery.py
@@ -6,7 +6,7 @@
 import traceback
 import unittest
 
-from utils import TestNode, build_test_tree
+from utils import build_test_tree
 
 sys.path.insert(0, os.getcwd())
 
@@ -62,7 +62,8 @@ def parse_unittest_args(args: List[Arguments]) -> Tuple[str, str, str]:
     start_dir, pattern, top_level_dir = parse_unittest_args(unittest_args)
     cwd = os.path.abspath(start_dir)
     payload = {"cwd": cwd}
-    tests: TestNode = {}
+    tests = None
+    errors = []
 
     try:
         loader = unittest.TestLoader()
@@ -71,9 +72,10 @@ def parse_unittest_args(args: List[Arguments]) -> Tuple[str, str, str]:
         tests, errors = build_test_tree(suite, cwd)
     except:
         payload["status"] = "error"
-        payload["errors"] = [traceback.format_exc()]
+        errors.append(traceback.format_exc())
 
-    payload["tests"] = tests
+    if tests is not None:
+        payload["tests"] = tests
 
     if len(errors):
         payload["errors"] = errors
diff --git a/pythonFiles/unittestadapter/utils.py b/pythonFiles/unittestadapter/utils.py
index 077411af3b2d..11cd01858ed2 100644
--- a/pythonFiles/unittestadapter/utils.py
+++ b/pythonFiles/unittestadapter/utils.py
@@ -78,9 +78,12 @@ def build_test_node(path: str, name: str, type: TestNodeTypeEnum) -> TestNode:
     }
 
 
-def find_child_node(name: str, type: TestNodeTypeEnum, root: TestNode) -> TestNode:
+def get_child_node(
+    name: str, path: str, type: TestNodeTypeEnum, root: TestNode
+) -> TestNode:
     """
     Find a child node in a test tree given its name and type.
+    If the node doesn't exist, create it.
     """
     try:
         result = next(
@@ -89,7 +92,7 @@ def find_child_node(name: str, type: TestNodeTypeEnum, root: TestNode) -> TestNo
             if node["name"] == name and node["type"] == type
         )
     except StopIteration:
-        result = build_test_node(f'{root["path"]}/{name}', name, type)
+        result = build_test_node(path, name, type)
         root["children"].append(result)
 
     return result
@@ -154,18 +157,23 @@ def build_test_tree(
 
             # Find/build folder nodes
             for folder in folders:
-                current_node = find_child_node(
-                    folder, TestNodeTypeEnum.folder, current_node
+                current_node = get_child_node(
+                    folder,
+                    f'{current_node["path"]}/{folder}',
+                    TestNodeTypeEnum.folder,
+                    current_node,
                 )
 
             # Find/build file node
-            current_node = find_child_node(
-                py_filename, TestNodeTypeEnum.file, current_node
+            path_components = [test_directory] + folders + [py_filename]
+            file_path = "/".join(path_components)
+            current_node = get_child_node(
+                py_filename, file_path, TestNodeTypeEnum.file, current_node
             )
 
             # Find/build class node
-            current_node = find_child_node(
-                class_name, TestNodeTypeEnum.class_, current_node
+            current_node = get_child_node(
+                class_name, file_path, TestNodeTypeEnum.class_, current_node
             )
 
             # Get test line number
@@ -176,7 +184,7 @@ def build_test_tree(
             test_node: TestItem = {
                 "id_": test_id,
                 "name": function_name,
-                "path": f'{current_node["path"]}/{function_name}',
+                "path": file_path,
                 "lineno": lineno,
                 "type_": TestNodeTypeEnum.test,
             }
diff --git a/src/client/testing/common/types.ts b/src/client/testing/common/types.ts
index b1476e74435f..a5f69971a3e2 100644
--- a/src/client/testing/common/types.ts
+++ b/src/client/testing/common/types.ts
@@ -8,6 +8,10 @@ export type UnitTestProduct = Product.pytest | Product.unittest;
 // ****************
 // test args/options
 
+export type TestCommandOptions = TestDiscoveryOptions & {
+    port: number;
+};
+
 export type TestDiscoveryOptions = {
     workspaceFolder: Uri;
     cwd: string;
diff --git a/src/client/testing/testController/common/commandRunner.ts b/src/client/testing/testController/common/commandRunner.ts
new file mode 100644
index 000000000000..b5752b3e3711
--- /dev/null
+++ b/src/client/testing/testController/common/commandRunner.ts
@@ -0,0 +1,68 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+import * as http from 'http';
+import {
+    ExecutionFactoryCreateWithEnvironmentOptions,
+    IPythonExecutionFactory,
+    SpawnOptions,
+} from '../../../common/process/types';
+import { createDeferred } from '../../../common/utils/async';
+import { TestCommandOptions } from '../../common/types';
+
+export async function runTestCommand(
+    executionFactory: IPythonExecutionFactory,
+    options: TestCommandOptions,
+): Promise<string> {
+    const deferred = createDeferred<string>();
+    let server: http.Server;
+
+    // Create the Python environment in which to execute the command.
+    const creationOptions: ExecutionFactoryCreateWithEnvironmentOptions = {
+        allowEnvironmentFetchExceptions: false,
+        resource: options.workspaceFolder,
+    };
+    const execService = await executionFactory.createActivatedEnvironment(creationOptions);
+
+    const spawnOptions: SpawnOptions = {
+        token: options.token,
+        cwd: options.cwd,
+        throwOnStdErr: true,
+    };
+
+    // Handler to parse the request body.
+    const requestListener: http.RequestListener = async (request, response) => {
+        const buffers = [];
+
+        for await (const chunk of request) {
+            buffers.push(chunk);
+        }
+
+        const data = Buffer.concat(buffers).toString();
+
+        // Close the connection.
+        response.end();
+        server.close();
+
+        deferred.resolve(data);
+    };
+
+    // Create the server, and execute the Python command when it's ready.
+    // The Python command will connect to the server, send its output back, and disconnect.
+    // Once we receive the output, we can close the server (done in requestListener).
+    server = http.createServer(requestListener);
+    server.maxConnections = 1;
+
+    server.listen(options.port, async () => {
+        if (options.outChannel) {
+            options.outChannel.appendLine(`python ${options.args.join(' ')}`);
+        }
+
+        try {
+            await execService.exec(options.args, spawnOptions);
+        } catch (ex) {
+            deferred.reject(ex);
+        }
+    });
+
+    return deferred.promise;
+}
diff --git a/src/client/testing/testController/common/testItemUtilities.ts b/src/client/testing/testController/common/testItemUtilities.ts
index 525e36e4235d..8b8b59051ec4 100644
--- a/src/client/testing/testController/common/testItemUtilities.ts
+++ b/src/client/testing/testController/common/testItemUtilities.ts
@@ -50,10 +50,9 @@ export function removeItemByIdFromChildren(
     });
 }
 
-export function createErrorTestItem(
-    testController: TestController,
-    options: { id: string; label: string; error: string },
-): TestItem {
+export type ErrorTestItemOptions = { id: string; label: string; error: string };
+
+export function createErrorTestItem(testController: TestController, options: ErrorTestItemOptions): TestItem {
     const testItem = testController.createTestItem(options.id, options.label);
     testItem.canResolveChildren = false;
     testItem.error = options.error;
diff --git a/src/client/testing/testController/common/types.ts b/src/client/testing/testController/common/types.ts
index 709625049a46..3909b4018280 100644
--- a/src/client/testing/testController/common/types.ts
+++ b/src/client/testing/testController/common/types.ts
@@ -11,6 +11,8 @@ import {
     Uri,
     WorkspaceFolder,
 } from 'vscode';
+import { IPythonExecutionFactory } from '../../../common/process/types';
+import { IConfigurationService } from '../../../common/types';
 import { TestDiscoveryOptions } from '../../common/types';
 
 export type TestRunInstanceOptions = TestRunOptions & {
@@ -86,6 +88,40 @@ export type TestRunOptions = {
     token: CancellationToken;
 };
 
+export interface ITestDiscoveryAdapter {
+    executionFactory: IPythonExecutionFactory;
+    configSettings: IConfigurationService;
+    port: number;
+    discoverTests(uri: Uri): Promise<DiscoveredTestPayload>;
+}
+
+// New test discovery adapter types
+
+export type DiscoveredTestCommon = {
+    path: string;
+    name: string;
+    // Same types as in pythonFiles/unittestadapter/utils.py
+    // Trailing underscore to avoid collision with the 'types' Python keyword.
+    type_: 'folder' | 'file' | 'class' | 'test';
+};
+
+export type DiscoveredTestItem = DiscoveredTestCommon & {
+    lineno: number;
+    // Trailing underscore to avoid collision with the 'id' Python keyword.
+    id_: string;
+};
+
+export type DiscoveredTestNode = DiscoveredTestCommon & {
+    children: (DiscoveredTestNode | DiscoveredTestItem)[];
+};
+
+export type DiscoveredTestPayload = {
+    cwd: string;
+    tests?: DiscoveredTestNode;
+    status: 'success' | 'error';
+    errors?: string[];
+};
+
 // We expose these here as a convenience and to cut down on churn
 // elsewhere in the code.
 type RawTestNode = {
diff --git a/src/client/testing/testController/common/utils.ts b/src/client/testing/testController/common/utils.ts
index 13fc76a37199..f2c201dc9e0f 100644
--- a/src/client/testing/testController/common/utils.ts
+++ b/src/client/testing/testController/common/utils.ts
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+export const DEFAULT_TEST_PORT = 45454;
+
 export function fixLogLines(content: string): string {
     const lines = content.split(/\r?\n/g);
     return `${lines.join('\r\n')}\r\n`;
diff --git a/src/client/testing/testController/controller.ts b/src/client/testing/testController/controller.ts
index 91d0f4427a10..51a3842f9354 100644
--- a/src/client/testing/testController/controller.ts
+++ b/src/client/testing/testController/controller.ts
@@ -18,6 +18,7 @@ import {
 } from 'vscode';
 import { IExtensionSingleActivationService } from '../../activation/types';
 import { IWorkspaceService } from '../../common/application/types';
+import { IPythonExecutionFactory } from '../../common/process/types';
 import { IConfigurationService, IDisposableRegistry, Resource } from '../../common/types';
 import { DelayedTrigger, IDelayedTrigger } from '../../common/utils/delayTrigger';
 import { traceVerbose } from '../../logging';
@@ -26,11 +27,14 @@ import { EventName } from '../../telemetry/constants';
 import { PYTEST_PROVIDER, UNITTEST_PROVIDER } from '../common/constants';
 import { DebugTestTag, getNodeByUri, RunTestTag } from './common/testItemUtilities';
 import { ITestController, ITestFrameworkController, TestRefreshOptions } from './common/types';
+import { WorkspaceTestAdapter } from './workspaceTestAdapter';
 
 @injectable()
 export class PythonTestController implements ITestController, IExtensionSingleActivationService {
     public readonly supportedWorkspaceTypes = { untrustedWorkspace: false, virtualWorkspace: false };
 
+    private readonly testAdapters: WorkspaceTestAdapter[] = [];
+
     private readonly testController: TestController;
 
     private readonly refreshData: IDelayedTrigger;
@@ -57,6 +61,7 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
         @inject(ITestFrameworkController) @named(PYTEST_PROVIDER) private readonly pytest: ITestFrameworkController,
         @inject(ITestFrameworkController) @named(UNITTEST_PROVIDER) private readonly unittest: ITestFrameworkController,
         @inject(IDisposableRegistry) private readonly disposables: IDisposableRegistry,
+        @inject(IPythonExecutionFactory) private readonly pythonExecFactory: IPythonExecutionFactory,
     ) {
         this.refreshCancellation = new CancellationTokenSource();
 
@@ -143,7 +148,8 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
             if (settings.testing.pytestEnabled) {
                 await this.pytest.refreshTestData(this.testController, uri, this.refreshCancellation.token);
             } else if (settings.testing.unittestEnabled) {
-                await this.unittest.refreshTestData(this.testController, uri, this.refreshCancellation.token);
+                await this.testAdapters[0].discoverTests(this.testController, uri, this.refreshCancellation.token);
+                // await this.unittest.refreshTestData(this.testController, uri, this.refreshCancellation.token);
             } else {
                 sendTelemetryEvent(EventName.UNITTEST_DISABLED);
                 // If we are here we may have to remove an existing node from the tree
diff --git a/src/client/testing/testController/unittest/testDiscoveryAdapter.ts b/src/client/testing/testController/unittest/testDiscoveryAdapter.ts
new file mode 100644
index 000000000000..cf46453a89b8
--- /dev/null
+++ b/src/client/testing/testController/unittest/testDiscoveryAdapter.ts
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import * as path from 'path';
+import { Uri } from 'vscode';
+import { IPythonExecutionFactory } from '../../../common/process/types';
+import { IConfigurationService } from '../../../common/types';
+import { EXTENSION_ROOT_DIR } from '../../../constants';
+import { TestCommandOptions } from '../../common/types';
+import { runTestCommand } from '../common/commandRunner';
+import { DiscoveredTestPayload, ITestDiscoveryAdapter } from '../common/types';
+
+export class UnittestTestDiscoveryAdapter implements ITestDiscoveryAdapter {
+    constructor(
+        public executionFactory: IPythonExecutionFactory,
+        public configSettings: IConfigurationService,
+        public port: number,
+    ) {}
+
+    public async discoverTests(uri: Uri): Promise<DiscoveredTestPayload> {
+        const settings = this.configSettings.getSettings(uri);
+        const { unittestArgs } = settings.testing;
+
+        const command = this.buildDiscoveryCommand(unittestArgs);
+
+        const options: TestCommandOptions = {
+            workspaceFolder: uri,
+            port: this.port,
+            args: command,
+            cwd: uri.fsPath,
+            ignoreCache: false,
+        };
+
+        const result = await runTestCommand(this.executionFactory, options);
+        const testData = JSON.parse(result);
+
+        return Promise.resolve(testData);
+    }
+
+    private buildDiscoveryCommand(args: string[]): string[] {
+        const discoveryScript = path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'unittestadapter', 'discovery.py');
+        return [discoveryScript, '--port', `${this.port}`, '--', ...args];
+    }
+}
diff --git a/src/client/testing/testController/workspaceTestAdapter.ts b/src/client/testing/testController/workspaceTestAdapter.ts
new file mode 100644
index 000000000000..226586153d8a
--- /dev/null
+++ b/src/client/testing/testController/workspaceTestAdapter.ts
@@ -0,0 +1,214 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import * as path from 'path';
+import * as util from 'util';
+import { CancellationToken, Position, Range, TestController, TestItem, Uri } from 'vscode';
+import { IWorkspaceService } from '../../common/application/types';
+import { IPythonExecutionFactory } from '../../common/process/types';
+import { IConfigurationService } from '../../common/types';
+import { createDeferred, Deferred } from '../../common/utils/async';
+import { Testing } from '../../common/utils/localize';
+import { traceError } from '../../logging';
+import { sendTelemetryEvent } from '../../telemetry';
+import { EventName } from '../../telemetry/constants';
+import { TestProvider } from '../types';
+import { createErrorTestItem, DebugTestTag, ErrorTestItemOptions, RunTestTag } from './common/testItemUtilities';
+import { DiscoveredTestItem, DiscoveredTestNode, ITestDiscoveryAdapter } from './common/types';
+import { DEFAULT_TEST_PORT } from './common/utils';
+import { UnittestTestDiscoveryAdapter } from './unittest/testDiscoveryAdapter';
+
+export class WorkspaceTestAdapter {
+    private discoveryAdapter: ITestDiscoveryAdapter;
+
+    private discovering: Map<string, Deferred<void>> = new Map();
+
+    private testData: DiscoveredTestNode | undefined;
+
+    // private running: ITestRunningAdapter;
+
+    constructor(
+        public testProvider: TestProvider,
+        executionFactory: IPythonExecutionFactory,
+        private workspaceService: IWorkspaceService,
+        configSettings: IConfigurationService,
+        private workspaceUri: Uri,
+        index: number,
+    ) {
+        if (this.testProvider === 'unittest') {
+            const port = DEFAULT_TEST_PORT + index * 10;
+
+            this.discoveryAdapter = new UnittestTestDiscoveryAdapter(executionFactory, configSettings, port);
+        } else {
+            // TODO: PYTEST DISCOVERY ADAPTER
+            // this is a placeholder for now
+            this.discoveryAdapter = new UnittestTestDiscoveryAdapter(executionFactory, configSettings, 45454);
+        }
+    }
+
+    public async discoverTests(testController: TestController, uri: Uri, token?: CancellationToken): Promise<void> {
+        sendTelemetryEvent(EventName.UNITTEST_DISCOVERING, undefined, { tool: 'unittest' });
+
+        // TODO: When can the uri differ from this.workspaceUri?
+        // If never, don't pass uri as an arg and use this.workspaceUri everywhere.
+        console.warn(`workspace uri: ${this.workspaceUri.fsPath} - discovery uri: ${uri.fsPath}`);
+
+        const workspace = this.workspaceService.getWorkspaceFolder(uri);
+
+        if (workspace) {
+            // Discovery is expensive. If it is already running, use the existing promise.
+            const discoveryUri = workspace.uri;
+            const previous = this.discovering.get(discoveryUri.fsPath);
+            if (previous) {
+                return previous.promise;
+            }
+
+            const deferred = createDeferred<void>();
+            this.discovering.set(discoveryUri.fsPath, deferred);
+
+            let rawTestData;
+            try {
+                rawTestData = await this.discoveryAdapter.discoverTests(discoveryUri);
+
+                deferred.resolve();
+            } catch (ex) {
+                sendTelemetryEvent(EventName.UNITTEST_DISCOVERY_DONE, undefined, { tool: 'unittest', failed: true });
+
+                const cancel = token?.isCancellationRequested
+                    ? Testing.cancelUnittestDiscovery()
+                    : Testing.errorUnittestDiscovery();
+
+                traceError(`${cancel}\r\n`, ex);
+
+                // Report also on the test view.
+                const message = util.format(`${cancel} ${Testing.seePythonOutput()}\r\n`, ex);
+                const options = buildErrorNodeOptions(discoveryUri, message);
+                const errorNode = createErrorTestItem(testController, options);
+                testController.items.add(errorNode);
+
+                deferred.reject(ex as Error);
+            } finally {
+                // Discovery has finished running, we have the data,
+                // we don't need the deferred promise anymore.
+                this.discovering.delete(discoveryUri.fsPath);
+            }
+
+            if (!rawTestData) {
+                // No test data is available
+                return Promise.resolve();
+            }
+
+            // Check if there were any errors in the discovery process.
+            if (rawTestData.status === 'error') {
+                const { errors } = rawTestData;
+                traceError(Testing.errorUnittestDiscovery(), '\r\n', errors!.join('\r\n\r\n'));
+
+                let errorNode = testController.items.get(`DiscoveryError:${uri.fsPath}`);
+                const message = util.format(
+                    `${Testing.errorUnittestDiscovery()} ${Testing.seePythonOutput()}\r\n`,
+                    errors!.join('\r\n\r\n'),
+                );
+
+                if (errorNode === undefined) {
+                    const options = buildErrorNodeOptions(discoveryUri, message);
+                    errorNode = createErrorTestItem(testController, options);
+                    testController.items.add(errorNode);
+                }
+                errorNode.error = message;
+            } else {
+                // Remove the error node if necessary,
+                // then parse and insert test data.
+                testController.items.delete(`DiscoveryError:${discoveryUri.fsPath}`);
+
+                // Find test root in the test controller.
+                const rootPath = rawTestData.cwd;
+                const workspaceNode = testController.items.get(rootPath);
+
+                // If the test root exists: Workspace refresh, update its children.
+                // Otherwise, it is a freshly discovered workspace, and we need to create a new test root and populate the test tree.
+                if (workspaceNode) {
+                    console.warn(`Update test tree with:\n${rawTestData}`);
+                    // updateTestTree(testController, workspaceNode, parsedData, token);
+                } else if (rawTestData.tests) {
+                    populateTestTree(testController, rawTestData.tests, undefined, token);
+                }
+
+                // Save new test data state.
+                this.testData = rawTestData.tests;
+            }
+
+            console.warn(this.testData);
+        }
+
+        sendTelemetryEvent(EventName.UNITTEST_DISCOVERY_DONE, undefined, { tool: 'unittest', failed: false });
+        return Promise.resolve();
+    }
+}
+
+function isTestItem(test: DiscoveredTestNode | DiscoveredTestItem): test is DiscoveredTestItem {
+    return test.type_ === 'test';
+}
+
+// function updateTestTree(
+//     testController: TestController,
+//     testRoot: TestItem,
+//     parsedTestData: UParsedTestNode,
+//     token?: CancellationToken,
+// ): void {
+// /**
+//  * Algorithm:
+//  *
+//  */
+// }
+
+function populateTestTree(
+    testController: TestController,
+    testTreeData: DiscoveredTestNode,
+    testRoot: TestItem | undefined,
+    token?: CancellationToken,
+): void {
+    // If testRoot is undefined, use the info of the root item of testTreeData to create a test item, and append it to the test controller.
+    if (!testRoot) {
+        testRoot = testController.createTestItem(testTreeData.path, testTreeData.name, Uri.file(testTreeData.path));
+        testRoot.canResolveChildren = true;
+        testRoot.tags = [RunTestTag, DebugTestTag];
+
+        testController.items.add(testRoot);
+    }
+
+    // Recursively populate the tree with test data.
+    testTreeData.children.forEach((child) => {
+        if (!token?.isCancellationRequested) {
+            if (isTestItem(child)) {
+                const testItem = testController.createTestItem(child.id_, child.name, Uri.file(child.path));
+                const range = new Range(new Position(child.lineno - 1, 0), new Position(child.lineno, 0));
+
+                testItem.canResolveChildren = false;
+                testItem.range = range;
+                testItem.tags = [RunTestTag, DebugTestTag];
+
+                testRoot!.children.add(testItem);
+            } else {
+                let node = testController.items.get(child.path);
+
+                if (!node) {
+                    node = testController.createTestItem(child.path, child.name, Uri.file(child.path));
+
+                    node.canResolveChildren = true;
+                    node.tags = [RunTestTag, DebugTestTag];
+
+                    testRoot!.children.add(node);
+                }
+                populateTestTree(testController, child, node, token);
+            }
+        }
+    });
+}
+
+function buildErrorNodeOptions(uri: Uri, message: string): ErrorTestItemOptions {
+    return {
+        id: `DiscoveryError:${uri.fsPath}`,
+        label: `Unittest Discovery Error [${path.basename(uri.fsPath)}]`,
+        error: message,
+    };
+}

From 05f8599577c1833f8ae091d2f1fd95ae61bc613f Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Mon, 20 Dec 2021 18:22:04 -0800
Subject: [PATCH 10/87] Fix case where no tests are discovered

---
 pythonFiles/unittestadapter/utils.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pythonFiles/unittestadapter/utils.py b/pythonFiles/unittestadapter/utils.py
index 11cd01858ed2..01af4da5d7aa 100644
--- a/pythonFiles/unittestadapter/utils.py
+++ b/pythonFiles/unittestadapter/utils.py
@@ -190,4 +190,7 @@ def build_test_tree(
             }
             current_node["children"].append(test_node)
 
+    if len(root["children"]) == 0:
+        root = None
+
     return root, errors

From 5876dde381cc428009d12c5abb1e49072d771393 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Wed, 22 Dec 2021 15:08:10 -0800
Subject: [PATCH 11/87] Add test tree update support

---
 .../testController/workspaceTestAdapter.ts    | 121 +++++++++++++++---
 1 file changed, 103 insertions(+), 18 deletions(-)

diff --git a/src/client/testing/testController/workspaceTestAdapter.ts b/src/client/testing/testController/workspaceTestAdapter.ts
index 226586153d8a..52fb23fe48a9 100644
--- a/src/client/testing/testController/workspaceTestAdapter.ts
+++ b/src/client/testing/testController/workspaceTestAdapter.ts
@@ -124,13 +124,18 @@ export class WorkspaceTestAdapter {
                 const rootPath = rawTestData.cwd;
                 const workspaceNode = testController.items.get(rootPath);
 
-                // If the test root exists: Workspace refresh, update its children.
-                // Otherwise, it is a freshly discovered workspace, and we need to create a new test root and populate the test tree.
-                if (workspaceNode) {
-                    console.warn(`Update test tree with:\n${rawTestData}`);
-                    // updateTestTree(testController, workspaceNode, parsedData, token);
-                } else if (rawTestData.tests) {
-                    populateTestTree(testController, rawTestData.tests, undefined, token);
+                if (rawTestData.tests) {
+                    // If the test root exists: Workspace refresh, update its children.
+                    // Otherwise, it is a freshly discovered workspace, and we need to create a new test root and populate the test tree.
+                    if (workspaceNode) {
+                        console.warn(`Update test tree with:\n${rawTestData}`);
+                        updateTestTree(testController, rawTestData.tests, this.testData, undefined, token);
+                    } else {
+                        populateTestTree(testController, rawTestData.tests, undefined, token);
+                    }
+                } else {
+                    // Delete everything from the test controller.
+                    testController.items.replace([]);
                 }
 
                 // Save new test data state.
@@ -149,17 +154,97 @@ function isTestItem(test: DiscoveredTestNode | DiscoveredTestItem): test is Disc
     return test.type_ === 'test';
 }
 
-// function updateTestTree(
-//     testController: TestController,
-//     testRoot: TestItem,
-//     parsedTestData: UParsedTestNode,
-//     token?: CancellationToken,
-// ): void {
-// /**
-//  * Algorithm:
-//  *
-//  */
-// }
+function deleteTestTree(testController: TestController, root?: TestItem) {
+    if (root) {
+        const { children } = root;
+
+        children.forEach((child) => {
+            deleteTestTree(testController, child);
+
+            const { id } = child;
+            testController.items.delete(id);
+        });
+
+        testController.items.delete(root.id);
+    }
+}
+
+function updateTestTree(
+    testController: TestController,
+    updatedData: DiscoveredTestNode,
+    localData: DiscoveredTestNode | undefined,
+    testRoot: TestItem | undefined,
+    token?: CancellationToken,
+): void {
+    // If testRoot is undefined, use the info of the root item of testTreeData to create a test item, and append it to the test controller.
+    if (!testRoot) {
+        testRoot = testController.createTestItem(updatedData.path, updatedData.name, Uri.file(updatedData.path));
+        testRoot.canResolveChildren = true;
+        testRoot.tags = [RunTestTag, DebugTestTag];
+
+        testController.items.add(testRoot);
+    }
+
+    // Delete existing items if they don't exist in the updated tree.
+    if (localData) {
+        localData.children.forEach((local) => {
+            if (!token?.isCancellationRequested) {
+                const exists = updatedData.children.find(
+                    (node) => local.name === node.name && local.path === node.path && local.type_ === node.type_,
+                );
+
+                if (!exists) {
+                    // Delete this node and all its children.
+                    const testItem = testController.items.get(local.path);
+                    deleteTestTree(testController, testItem);
+                }
+            }
+        });
+    }
+
+    // Go through the updated tree, update the existing nodes, and create new ones if necessary.
+    updatedData.children.forEach((child) => {
+        if (!token?.isCancellationRequested) {
+            const root = testController.items.get(child.path);
+            if (root) {
+                root.busy = true;
+                // Update existing test node or item.
+                if (isTestItem(child)) {
+                    // Update the only property that can be updated.
+                    root.label = child.name;
+                } else {
+                    const localNode = localData?.children.find(
+                        (node) => child.name === node.name && child.path === node.path && child.type_ === node.type_,
+                    );
+                    updateTestTree(testController, child, localNode as DiscoveredTestNode, root, token);
+                }
+                root.busy = false;
+            } else {
+                // Create new test node or item.
+                let testItem;
+                if (isTestItem(child)) {
+                    testItem = testController.createTestItem(child.id_, child.name, Uri.file(child.path));
+                    const range = new Range(new Position(child.lineno - 1, 0), new Position(child.lineno, 0));
+
+                    testItem.canResolveChildren = false;
+                    testItem.tags = [RunTestTag, DebugTestTag];
+                    testItem.range = range;
+
+                    testRoot!.children.add(testItem);
+                } else {
+                    testItem = testController.createTestItem(child.path, child.name, Uri.file(child.path));
+                    testItem.canResolveChildren = true;
+                    testItem.tags = [RunTestTag, DebugTestTag];
+
+                    testRoot!.children.add(testItem);
+
+                    // Populate the test tree under the newly created node.
+                    populateTestTree(testController, child, testItem, token);
+                }
+            }
+        }
+    });
+}
 
 function populateTestTree(
     testController: TestController,

From d1f7e1a779a1fda1f7d51d3dd616743758f8f663 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Tue, 4 Jan 2022 16:15:35 -0800
Subject: [PATCH 12/87] Localization

---
 package.nls.json                    | 1 +
 src/client/common/utils/localize.ts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/package.nls.json b/package.nls.json
index 5bb8a45d62cb..ea8aaac9006d 100644
--- a/package.nls.json
+++ b/package.nls.json
@@ -73,6 +73,7 @@
     "Common.learnMore": "Learn more",
     "Common.reportThisIssue": "Report this issue",
     "Common.recommended": "Recommended",
+    "Common.workspace": "Workspace",
     "CommonSurvey.remindMeLaterLabel": "Remind me later",
     "CommonSurvey.yesLabel": "Yes, take survey now",
     "CommonSurvey.noLabel": "No, thanks",
diff --git a/src/client/common/utils/localize.ts b/src/client/common/utils/localize.ts
index e3a9d0732c20..5d28041f8e71 100644
--- a/src/client/common/utils/localize.ts
+++ b/src/client/common/utils/localize.ts
@@ -92,6 +92,7 @@ export namespace Common {
     export const and = localize('Common.and', 'and');
     export const reportThisIssue = localize('Common.reportThisIssue', 'Report this issue');
     export const recommended = localize('Common.recommended', 'Recommended');
+    export const workspace = localize('Common.workspace', 'Workspace');
 }
 
 export namespace CommonSurvey {

From a60b3dfe5b547b326f3a9321548134aa65946ee6 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Tue, 4 Jan 2022 16:15:55 -0800
Subject: [PATCH 13/87] Multiroot workspace support

---
 .../testing/testController/common/types.ts    |  8 ++-
 .../testing/testController/controller.ts      | 29 ++++++++-
 .../testController/workspaceTestAdapter.ts    | 62 +++++++++++++++----
 3 files changed, 81 insertions(+), 18 deletions(-)

diff --git a/src/client/testing/testController/common/types.ts b/src/client/testing/testController/common/types.ts
index 3909b4018280..b905f63c9102 100644
--- a/src/client/testing/testController/common/types.ts
+++ b/src/client/testing/testController/common/types.ts
@@ -97,12 +97,14 @@ export interface ITestDiscoveryAdapter {
 
 // New test discovery adapter types
 
+// Same types as in pythonFiles/unittestadapter/utils.py
+// Trailing underscore to avoid collision with the 'types' Python keyword.
+export type DiscoveredTestType = 'folder' | 'file' | 'class' | 'test';
+
 export type DiscoveredTestCommon = {
     path: string;
     name: string;
-    // Same types as in pythonFiles/unittestadapter/utils.py
-    // Trailing underscore to avoid collision with the 'types' Python keyword.
-    type_: 'folder' | 'file' | 'class' | 'test';
+    type_: DiscoveredTestType;
 };
 
 export type DiscoveredTestItem = DiscoveredTestCommon & {
diff --git a/src/client/testing/testController/controller.ts b/src/client/testing/testController/controller.ts
index 51a3842f9354..15cb96f6837c 100644
--- a/src/client/testing/testController/controller.ts
+++ b/src/client/testing/testController/controller.ts
@@ -21,6 +21,7 @@ import { IWorkspaceService } from '../../common/application/types';
 import { IPythonExecutionFactory } from '../../common/process/types';
 import { IConfigurationService, IDisposableRegistry, Resource } from '../../common/types';
 import { DelayedTrigger, IDelayedTrigger } from '../../common/utils/delayTrigger';
+import { Common } from '../../common/utils/localize';
 import { traceVerbose } from '../../logging';
 import { sendTelemetryEvent } from '../../telemetry';
 import { EventName } from '../../telemetry/constants';
@@ -33,7 +34,7 @@ import { WorkspaceTestAdapter } from './workspaceTestAdapter';
 export class PythonTestController implements ITestController, IExtensionSingleActivationService {
     public readonly supportedWorkspaceTypes = { untrustedWorkspace: false, virtualWorkspace: false };
 
-    private readonly testAdapters: WorkspaceTestAdapter[] = [];
+    private readonly testAdapters: Map<Uri, WorkspaceTestAdapter> = new Map();
 
     private readonly testController: TestController;
 
@@ -148,7 +149,17 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
             if (settings.testing.pytestEnabled) {
                 await this.pytest.refreshTestData(this.testController, uri, this.refreshCancellation.token);
             } else if (settings.testing.unittestEnabled) {
-                await this.testAdapters[0].discoverTests(this.testController, uri, this.refreshCancellation.token);
+                const workspace = this.workspaceService.getWorkspaceFolder(uri);
+                console.warn(`workspace name: ${workspace?.name} - uri: ${uri.fsPath}`);
+                const testAdapter =
+                    this.testAdapters.get(uri) || (this.testAdapters.values().next().value as WorkspaceTestAdapter);
+                testAdapter.discoverTests(
+                    this.testController,
+                    uri,
+                    this.refreshCancellation.token,
+                    this.testAdapters.size > 1,
+                    this.workspaceService.workspaceFile?.fsPath || Common.workspace(),
+                );
                 // await this.unittest.refreshTestData(this.testController, uri, this.refreshCancellation.token);
             } else {
                 sendTelemetryEvent(EventName.UNITTEST_DISABLED);
@@ -297,8 +308,20 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
 
     private watchForTestChanges(): void {
         const workspaces: readonly WorkspaceFolder[] = this.workspaceService.workspaceFolders || [];
-        for (const workspace of workspaces) {
+        for (let i = 0; i < workspaces.length; i += 1) {
+            const workspace = workspaces[i];
+            console.warn(`instantiating test adapters - workspace name: ${workspace.name}`);
             const settings = this.configSettings.getSettings(workspace.uri);
+            const workspaceTestAdapter = new WorkspaceTestAdapter(
+                'unittest',
+                this.pythonExecFactory,
+                this.workspaceService,
+                this.configSettings,
+                i,
+            );
+
+            this.testAdapters.set(workspace.uri, workspaceTestAdapter);
+
             if (settings.testing.autoTestDiscoverOnSaveEnabled) {
                 traceVerbose(`Testing: Setting up watcher for ${workspace.uri.fsPath}`);
                 this.watchForSettingsChanges(workspace);
diff --git a/src/client/testing/testController/workspaceTestAdapter.ts b/src/client/testing/testController/workspaceTestAdapter.ts
index 52fb23fe48a9..1f876eed434e 100644
--- a/src/client/testing/testController/workspaceTestAdapter.ts
+++ b/src/client/testing/testController/workspaceTestAdapter.ts
@@ -14,7 +14,7 @@ import { sendTelemetryEvent } from '../../telemetry';
 import { EventName } from '../../telemetry/constants';
 import { TestProvider } from '../types';
 import { createErrorTestItem, DebugTestTag, ErrorTestItemOptions, RunTestTag } from './common/testItemUtilities';
-import { DiscoveredTestItem, DiscoveredTestNode, ITestDiscoveryAdapter } from './common/types';
+import { DiscoveredTestItem, DiscoveredTestNode, DiscoveredTestType, ITestDiscoveryAdapter } from './common/types';
 import { DEFAULT_TEST_PORT } from './common/utils';
 import { UnittestTestDiscoveryAdapter } from './unittest/testDiscoveryAdapter';
 
@@ -32,7 +32,6 @@ export class WorkspaceTestAdapter {
         executionFactory: IPythonExecutionFactory,
         private workspaceService: IWorkspaceService,
         configSettings: IConfigurationService,
-        private workspaceUri: Uri,
         index: number,
     ) {
         if (this.testProvider === 'unittest') {
@@ -46,13 +45,19 @@ export class WorkspaceTestAdapter {
         }
     }
 
-    public async discoverTests(testController: TestController, uri: Uri, token?: CancellationToken): Promise<void> {
+    public async discoverTests(
+        testController: TestController,
+        uri: Uri,
+        token?: CancellationToken,
+        isMultiroot?: boolean,
+        workspaceFilePath?: string,
+    ): Promise<void> {
         sendTelemetryEvent(EventName.UNITTEST_DISCOVERING, undefined, { tool: 'unittest' });
 
-        // TODO: When can the uri differ from this.workspaceUri?
-        // If never, don't pass uri as an arg and use this.workspaceUri everywhere.
-        console.warn(`workspace uri: ${this.workspaceUri.fsPath} - discovery uri: ${uri.fsPath}`);
+        console.warn(`discovery uri: ${uri.fsPath}`);
 
+        // The uri parameter can differ from the workspace uri when we're in a multiroot workspace scenario.
+        // As such, we don't rely on this.workspaceUri
         const workspace = this.workspaceService.getWorkspaceFolder(uri);
 
         if (workspace) {
@@ -120,21 +125,52 @@ export class WorkspaceTestAdapter {
                 // then parse and insert test data.
                 testController.items.delete(`DiscoveryError:${discoveryUri.fsPath}`);
 
-                // Find test root in the test controller.
-                const rootPath = rawTestData.cwd;
-                const workspaceNode = testController.items.get(rootPath);
+                // If we are in a multiroot workspace scenario, find the overall root (should be the workspace file name),
+                // And wrap the current folder's test result in a tree under the overall root + the current folder name.
+                let workspaceNode: TestItem | undefined;
+                if (isMultiroot && workspaceFilePath) {
+                    const rootFilename = path.basename(workspaceFilePath);
+                    workspaceNode = testController.items.get(workspaceFilePath);
+
+                    const workspacePath = workspace.uri.fsPath;
+                    const wrappedTests = rawTestData.tests;
+
+                    const children = [
+                        {
+                            path: workspacePath,
+                            name: path.basename(workspacePath),
+                            type_: 'folder' as DiscoveredTestType,
+                            children: wrappedTests ? [wrappedTests] : [],
+                        },
+                    ];
+
+                    rawTestData.tests = {
+                        path: workspaceFilePath,
+                        name: rootFilename,
+                        type_: 'folder',
+                        children,
+                    };
+                } else {
+                    // Find the root for this test data in the test controller.
+                    const rootPath = rawTestData.cwd;
+                    workspaceNode = testController.items.get(rootPath);
+                }
 
                 if (rawTestData.tests) {
-                    // If the test root exists: Workspace refresh, update its children.
+                    // If the test root for this folder exists: Workspace refresh, update its children.
                     // Otherwise, it is a freshly discovered workspace, and we need to create a new test root and populate the test tree.
                     if (workspaceNode) {
-                        console.warn(`Update test tree with:\n${rawTestData}`);
-                        updateTestTree(testController, rawTestData.tests, this.testData, undefined, token);
+                        console.warn(`Update test tree with:`);
+                        console.warn(rawTestData);
+                        updateTestTree(testController, rawTestData.tests, this.testData, workspaceNode, token);
                     } else {
+                        console.warn(`Populate test tree with:`);
+                        console.warn(rawTestData);
                         populateTestTree(testController, rawTestData.tests, undefined, token);
                     }
                 } else {
                     // Delete everything from the test controller.
+                    console.warn(`Delete everything from the test controller.`);
                     testController.items.replace([]);
                 }
 
@@ -252,6 +288,8 @@ function populateTestTree(
     testRoot: TestItem | undefined,
     token?: CancellationToken,
 ): void {
+    console.warn(`populate test tree:`);
+    console.warn(testTreeData);
     // If testRoot is undefined, use the info of the root item of testTreeData to create a test item, and append it to the test controller.
     if (!testRoot) {
         testRoot = testController.createTestItem(testTreeData.path, testTreeData.name, Uri.file(testTreeData.path));

From 96120eddb2ea679812f5c7c29ed2ca538aa2fa27 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Wed, 5 Jan 2022 16:25:35 -0800
Subject: [PATCH 14/87] Ship with the requests module

---
 pythonFiles/unittestadapter/discovery.py | 10 ++++++++--
 requirements.in                          |  3 +++
 requirements.txt                         | 20 ++++++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/pythonFiles/unittestadapter/discovery.py b/pythonFiles/unittestadapter/discovery.py
index 17995c0462a2..6eeb7cf951f7 100644
--- a/pythonFiles/unittestadapter/discovery.py
+++ b/pythonFiles/unittestadapter/discovery.py
@@ -1,14 +1,20 @@
 import getopt
 import os
 from typing import Any, List, Tuple
-import requests
 import sys
 import traceback
 import unittest
 
 from utils import build_test_tree
 
-sys.path.insert(0, os.getcwd())
+
+# Add the lib path to our sys path to find the requests module.
+EXTENSION_ROOT = os.path.dirname(
+    os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+)
+sys.path.insert(0, os.path.join(EXTENSION_ROOT, "pythonFiles", "lib", "python"))
+
+import requests
 
 # Get arguments
 argv = sys.argv[1:]
diff --git a/requirements.in b/requirements.in
index cf488dd47758..a0c12c649d62 100644
--- a/requirements.in
+++ b/requirements.in
@@ -3,5 +3,8 @@
 # 1) pip install pip-tools
 # 2) pip-compile --generate-hashes requirements.in
 
+# Unittest test adapter
+requests==2.26.0
+
 # Sort Imports
 isort==5.10.0
diff --git a/requirements.txt b/requirements.txt
index 9787fd0cf9fa..c9a4c0d8c17a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,27 @@
 #
 #    pip-compile --generate-hashes requirements.in
 #
+certifi==2021.10.8 \
+    --hash=sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872 \
+    --hash=sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569
+    # via requests
+charset-normalizer==2.0.9 \
+    --hash=sha256:1eecaa09422db5be9e29d7fc65664e6c33bd06f9ced7838578ba40d58bdf3721 \
+    --hash=sha256:b0b883e8e874edfdece9c28f314e3dd5badf067342e42fb162203335ae61aa2c
+    # via requests
+idna==3.3 \
+    --hash=sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff \
+    --hash=sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d
+    # via requests
 isort==5.10.0 \
     --hash=sha256:1a18ccace2ed8910bd9458b74a3ecbafd7b2f581301b0ab65cfdd4338272d76f \
     --hash=sha256:e52ff6d38012b131628cf0f26c51e7bd3a7c81592eefe3ac71411e692f1b9345
     # via -r requirements.in
+requests==2.26.0 \
+    --hash=sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24 \
+    --hash=sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7
+    # via -r requirements.in
+urllib3==1.26.7 \
+    --hash=sha256:4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece \
+    --hash=sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844
+    # via requests

From ec8c0446c338ebed3935fae08d9ad2c80736e486 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Wed, 5 Jan 2022 16:25:49 -0800
Subject: [PATCH 15/87] Make sure we don't shadow the "type" keyword

---
 pythonFiles/unittestadapter/utils.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pythonFiles/unittestadapter/utils.py b/pythonFiles/unittestadapter/utils.py
index 01af4da5d7aa..2a6ae06924dc 100644
--- a/pythonFiles/unittestadapter/utils.py
+++ b/pythonFiles/unittestadapter/utils.py
@@ -66,20 +66,20 @@ def get_source_line(obj) -> str:
 # Helper functions for test tree building.
 
 
-def build_test_node(path: str, name: str, type: TestNodeTypeEnum) -> TestNode:
+def build_test_node(path: str, name: str, type_: TestNodeTypeEnum) -> TestNode:
     """
     Build a test node with no children. A test node can be a folder, a file or a class.
     """
     return {
         "path": path,
         "name": name,
-        "type": type,
+        "type_": type_,
         "children": [],
     }
 
 
 def get_child_node(
-    name: str, path: str, type: TestNodeTypeEnum, root: TestNode
+    name: str, path: str, type_: TestNodeTypeEnum, root: TestNode
 ) -> TestNode:
     """
     Find a child node in a test tree given its name and type.
@@ -89,10 +89,10 @@ def get_child_node(
         result = next(
             node
             for node in root["children"]
-            if node["name"] == name and node["type"] == type
+            if node["name"] == name and node["type_"] == type_
         )
     except StopIteration:
-        result = build_test_node(path, name, type)
+        result = build_test_node(path, name, type_)
         root["children"].append(result)
 
     return result

From fe1a530c940b715b74426f174d8c28de851614b7 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Thu, 6 Jan 2022 09:59:32 -0800
Subject: [PATCH 16/87] Move discovery in a function

---
 pythonFiles/unittestadapter/discovery.py      | 36 +++++++++++--------
 .../unittest/testDiscoveryAdapter.ts          |  2 +-
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/pythonFiles/unittestadapter/discovery.py b/pythonFiles/unittestadapter/discovery.py
index 6eeb7cf951f7..dd215acb4465 100644
--- a/pythonFiles/unittestadapter/discovery.py
+++ b/pythonFiles/unittestadapter/discovery.py
@@ -1,6 +1,6 @@
 import getopt
 import os
-from typing import Any, List, Tuple
+from typing import Any, Dict, List, Tuple
 import sys
 import traceback
 import unittest
@@ -16,16 +16,6 @@
 
 import requests
 
-# Get arguments
-argv = sys.argv[1:]
-index = argv.index("--")
-
-script_args, _ = getopt.getopt(argv[:index], "", ["port="])
-unittest_args, _ = getopt.getopt(
-    argv[index + 1 :],
-    "vs:p:t:",
-    ["start-directory=", "pattern=", "top-level-directory="],
-)
 
 Arguments = Tuple[str, Any]
 
@@ -63,9 +53,7 @@ def parse_unittest_args(args: List[Arguments]) -> Tuple[str, str, str]:
     return start_dir, pattern, top_level_dir
 
 
-if __name__ == "__main__":
-    # Test discovery
-    start_dir, pattern, top_level_dir = parse_unittest_args(unittest_args)
+def discover_tests(start_dir, pattern, top_level_dir) -> Dict[str, Any]:
     cwd = os.path.abspath(start_dir)
     payload = {"cwd": cwd}
     tests = None
@@ -102,5 +90,25 @@ def parse_unittest_args(args: List[Arguments]) -> Tuple[str, str, str]:
     #     "status": "error",
     # }
 
+    return payload
+
+
+if __name__ == "__main__":
+    # Get unittest discovery arguments
+    argv = sys.argv[1:]
+    index = argv.index("--udiscovery")
+
+    script_args, _ = getopt.getopt(argv[:index], "", ["port="])
+    unittest_args, _ = getopt.getopt(
+        argv[index + 1 :],
+        "vs:p:t:",
+        ["start-directory=", "pattern=", "top-level-directory="],
+    )
+
+    start_dir, pattern, top_level_dir = parse_unittest_args(unittest_args)
+
+    # Perform test discovery & send it over
+    payload = discover_tests(start_dir, pattern, top_level_dir)
+
     port = parse_port(script_args)
     requests.post(f"http://localhost:{port}", json=payload)
diff --git a/src/client/testing/testController/unittest/testDiscoveryAdapter.ts b/src/client/testing/testController/unittest/testDiscoveryAdapter.ts
index cf46453a89b8..f4feacfeaa44 100644
--- a/src/client/testing/testController/unittest/testDiscoveryAdapter.ts
+++ b/src/client/testing/testController/unittest/testDiscoveryAdapter.ts
@@ -39,6 +39,6 @@ export class UnittestTestDiscoveryAdapter implements ITestDiscoveryAdapter {
 
     private buildDiscoveryCommand(args: string[]): string[] {
         const discoveryScript = path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'unittestadapter', 'discovery.py');
-        return [discoveryScript, '--port', `${this.port}`, '--', ...args];
+        return [discoveryScript, '--port', `${this.port}`, '--udiscovery', ...args];
     }
 }

From 02168b77c30e69556200ffcdd23b0a9290786bb5 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Thu, 6 Jan 2022 15:48:18 -0800
Subject: [PATCH 17/87] Add Python tests for utils functions

---
 .../unittestadapter/.data/utils_case_one.py   |  17 ++
 .../.data/utils_case_two/file_one.py          |  17 ++
 .../.data/utils_case_two/file_two.py          |  17 ++
 .../unittestadapter/.data/utils_tree_one.py   |  17 ++
 .../.data/utils_tree_three/file_one.py        |  18 ++
 .../.data/utils_tree_three/file_two.py        |  19 ++
 .../tests/unittestadapter/test_utils.py       | 237 ++++++++++++++++++
 pythonFiles/unittestadapter/utils.py          |   8 +-
 8 files changed, 347 insertions(+), 3 deletions(-)
 create mode 100644 pythonFiles/tests/unittestadapter/.data/utils_case_one.py
 create mode 100644 pythonFiles/tests/unittestadapter/.data/utils_case_two/file_one.py
 create mode 100644 pythonFiles/tests/unittestadapter/.data/utils_case_two/file_two.py
 create mode 100644 pythonFiles/tests/unittestadapter/.data/utils_tree_one.py
 create mode 100644 pythonFiles/tests/unittestadapter/.data/utils_tree_three/file_one.py
 create mode 100644 pythonFiles/tests/unittestadapter/.data/utils_tree_three/file_two.py
 create mode 100644 pythonFiles/tests/unittestadapter/test_utils.py

diff --git a/pythonFiles/tests/unittestadapter/.data/utils_case_one.py b/pythonFiles/tests/unittestadapter/.data/utils_case_one.py
new file mode 100644
index 000000000000..aa3a40d9686a
--- /dev/null
+++ b/pythonFiles/tests/unittestadapter/.data/utils_case_one.py
@@ -0,0 +1,17 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+import unittest
+
+
+class CaseOne(unittest.TestCase):
+    """
+    Test class for the test_simple_test_cases test.
+    get_test_case should return tests from the test suite.
+    """
+
+    def test_one(self) -> None:
+        self.assertGreater(2, 1)
+
+    def test_two(self) -> None:
+        self.assertNotEqual(2, 1)
diff --git a/pythonFiles/tests/unittestadapter/.data/utils_case_two/file_one.py b/pythonFiles/tests/unittestadapter/.data/utils_case_two/file_one.py
new file mode 100644
index 000000000000..e5ca901f31b5
--- /dev/null
+++ b/pythonFiles/tests/unittestadapter/.data/utils_case_two/file_one.py
@@ -0,0 +1,17 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+import unittest
+
+
+class CaseTwoFileOne(unittest.TestCase):
+    """
+    Test class for the test_nested_test_cases test.
+    get_test_case should return tests from the test suites in this folder.
+    """
+
+    def test_one(self) -> None:
+        self.assertGreater(2, 1)
+
+    def test_two(self) -> None:
+        self.assertNotEqual(2, 1)
diff --git a/pythonFiles/tests/unittestadapter/.data/utils_case_two/file_two.py b/pythonFiles/tests/unittestadapter/.data/utils_case_two/file_two.py
new file mode 100644
index 000000000000..8fa869e81434
--- /dev/null
+++ b/pythonFiles/tests/unittestadapter/.data/utils_case_two/file_two.py
@@ -0,0 +1,17 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+import unittest
+
+
+class CaseTwoFileTwo(unittest.TestCase):
+    """
+    Test class for the test_nested_test_cases test.
+    get_test_case should return tests from the test suites in this folder.
+    """
+
+    def test_one(self) -> None:
+        self.assertGreater(2, 1)
+
+    def test_two(self) -> None:
+        self.assertNotEqual(2, 1)
diff --git a/pythonFiles/tests/unittestadapter/.data/utils_tree_one.py b/pythonFiles/tests/unittestadapter/.data/utils_tree_one.py
new file mode 100644
index 000000000000..85848b87baac
--- /dev/null
+++ b/pythonFiles/tests/unittestadapter/.data/utils_tree_one.py
@@ -0,0 +1,17 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+import unittest
+
+
+class TreeOne(unittest.TestCase):
+    """
+    Test class for the test_build_simple_tree test.
+    build_test_tree should build a test tree with these test cases.
+    """
+
+    def test_one(self) -> None:
+        self.assertGreater(2, 1)
+
+    def test_two(self) -> None:
+        self.assertNotEqual(2, 1)
diff --git a/pythonFiles/tests/unittestadapter/.data/utils_tree_three/file_one.py b/pythonFiles/tests/unittestadapter/.data/utils_tree_three/file_one.py
new file mode 100644
index 000000000000..16fcecfc9c8d
--- /dev/null
+++ b/pythonFiles/tests/unittestadapter/.data/utils_tree_three/file_one.py
@@ -0,0 +1,18 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+import unittest
+
+
+class TreeThreeFileOne(unittest.TestCase):
+    """
+    Test class for the test_build_error_tree test.
+    build_test_tree should build a test tree with the valid test cases,
+    and return error messages for the failed discovered tests.
+    """
+
+    def test_one(self) -> None:
+        self.assertGreater(2, 1)
+
+    def test_two(self) -> None:
+        self.assertNotEqual(2, 1)
diff --git a/pythonFiles/tests/unittestadapter/.data/utils_tree_three/file_two.py b/pythonFiles/tests/unittestadapter/.data/utils_tree_three/file_two.py
new file mode 100644
index 000000000000..c8cc217f0ec9
--- /dev/null
+++ b/pythonFiles/tests/unittestadapter/.data/utils_tree_three/file_two.py
@@ -0,0 +1,19 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+import unittest
+import something_else
+
+
+class TreeThreeFileTwo(unittest.TestCase):
+    """
+    Test class for the test_build_error_tree test.
+    build_test_tree should build a test tree with the valid test cases,
+    and return error messages for the failed discovered tests.
+    """
+
+    def test_one(self) -> None:
+        self.assertGreater(2, 1)
+
+    def test_two(self) -> None:
+        self.assertNotEqual(2, 1)
diff --git a/pythonFiles/tests/unittestadapter/test_utils.py b/pythonFiles/tests/unittestadapter/test_utils.py
new file mode 100644
index 000000000000..92e97af4cc7a
--- /dev/null
+++ b/pythonFiles/tests/unittestadapter/test_utils.py
@@ -0,0 +1,237 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+import unittest
+
+from os import path
+from unittestadapter.utils import (
+    build_test_tree,
+    get_child_node,
+    get_test_case,
+    TestNode,
+    TestNodeTypeEnum,
+)
+
+
+def test_simple_test_cases() -> None:
+    expected = ["utils_case_one.CaseOne.test_one", "utils_case_one.CaseOne.test_two"]
+    actual = []
+
+    # Discover tests in .data/utils_case_one.py
+    start_dir = path.join(path.dirname(__file__), ".data")
+    pattern = "utils_case_one*"
+
+    loader = unittest.TestLoader()
+    suite = loader.discover(start_dir, pattern)
+
+    # Iterate on get_test_case and save the test id
+    for test in get_test_case(suite):
+        actual.append(test.id())
+
+    assert expected == actual
+
+
+def test_nested_test_cases() -> None:
+    expected = [
+        "file_one.CaseTwoFileOne.test_one",
+        "file_one.CaseTwoFileOne.test_two",
+        "file_two.CaseTwoFileTwo.test_one",
+        "file_two.CaseTwoFileTwo.test_two",
+    ]
+    actual = []
+
+    # Discover tests in .data/utils_case_two/
+    start_dir = path.join(path.dirname(__file__), ".data", "utils_case_two")
+    pattern = "file*"
+
+    loader = unittest.TestLoader()
+    suite = loader.discover(start_dir, pattern)
+
+    # Iterate on get_test_case and save the test id
+    for test in get_test_case(suite):
+        actual.append(test.id())
+
+    assert expected == actual
+
+
+def test_get_existing_child_node() -> None:
+    tree = {
+        "name": "root",
+        "path": "foo",
+        "type_": "folder",
+        "children": [
+            {
+                "name": "childOne",
+                "path": "child/one",
+                "type_": "folder",
+                "children": [
+                    {
+                        "name": "nestedOne",
+                        "path": "nested/one",
+                        "type_": "folder",
+                        "children": [],
+                    },
+                    {
+                        "name": "nestedTwo",
+                        "path": "nested/two",
+                        "type_": "folder",
+                        "children": [],
+                    },
+                ],
+            },
+            {
+                "name": "childTwo",
+                "path": "child/two",
+                "type_": "folder",
+                "children": [],
+            },
+        ],
+    }
+
+    initial_len = len(tree["children"])
+    result = get_child_node("childTwo", "child/two", "folder", tree)
+    post_len = len(tree["children"])
+
+    assert result is not None
+    assert initial_len == post_len
+
+
+def test_no_existing_child_node() -> None:
+    tree: TestNode = {
+        "name": "root",
+        "path": "foo",
+        "type_": "folder",
+        "children": [
+            {
+                "name": "childOne",
+                "path": "child/one",
+                "type_": "folder",
+                "children": [
+                    {
+                        "name": "nestedOne",
+                        "path": "nested/one",
+                        "type_": "folder",
+                        "children": [],
+                    },
+                    {
+                        "name": "nestedTwo",
+                        "path": "nested/two",
+                        "type_": "folder",
+                        "children": [],
+                    },
+                ],
+            },
+            {
+                "name": "childTwo",
+                "path": "child/two",
+                "type_": "folder",
+                "children": [],
+            },
+        ],
+    }
+
+    initial_len = len(tree["children"])
+    result = get_child_node("childThree", "child/three", "folder", tree)
+    post_len = len(tree["children"])
+    last_child = tree["children"][-1]
+
+    assert result is not None
+    assert last_child["name"] == "childThree"
+    assert initial_len < post_len
+
+
+# Helper function to test if two test trees are the same.
+def is_same_tree(tree1, tree2) -> bool:
+    # Compare the root
+    if (
+        tree1["path"] != tree2["path"]
+        or tree1["name"] != tree2["name"]
+        or tree1["type_"] != tree2["type_"]
+    ):
+        return False
+
+    # Compare child test nodes if they exist, otherwise compare test items.
+    if "children" in tree1 and "children" in tree2:
+        children1 = tree1["children"]
+        children2 = tree2["children"]
+
+        # Compare test nodes
+        if len(children1) != len(children2):
+            return False
+        else:
+            result = True
+            index = 0
+            while index < len(children1) and result == True:
+                result = result and is_same_tree(children1[index], children2[index])
+                index = index + 1
+            return result
+    elif "id_" in tree1 and "id_" in tree2:
+        # Compare test items
+        return tree1["id_"] == tree2["id_"] and tree1["lineno"] == tree2["lineno"]
+
+    return False
+
+
+def test_build_simple_tree() -> None:
+    # Discovery tests in utils_tree_one.py
+    start_dir = path.join(path.dirname(__file__), ".data")
+    pattern = "utils_tree_one*"
+
+    expected: TestNode = {
+        "path": start_dir,
+        "type_": TestNodeTypeEnum.folder,
+        "name": ".data",
+        "children": [
+            {
+                "name": "utils_tree_one.py",
+                "type_": TestNodeTypeEnum.file,
+                "path": path.join(start_dir, "utils_tree_one.py"),
+                "children": [
+                    {
+                        "name": "TreeOne",
+                        "path": path.join(start_dir, "utils_tree_one.py"),
+                        "type_": TestNodeTypeEnum.class_,
+                        "children": [
+                            {
+                                "id_": "utils_tree_one.TreeOne.test_one",
+                                "name": "test_one",
+                                "path": path.join(start_dir, "utils_tree_one.py"),
+                                "type_": TestNodeTypeEnum.test,
+                                "lineno": "13",
+                            },
+                            {
+                                "id_": "utils_tree_one.TreeOne.test_two",
+                                "name": "test_two",
+                                "path": path.join(start_dir, "utils_tree_one.py"),
+                                "type_": TestNodeTypeEnum.test,
+                                "lineno": "16",
+                            },
+                        ],
+                    }
+                ],
+            }
+        ],
+    }
+
+    loader = unittest.TestLoader()
+    suite = loader.discover(start_dir, pattern)
+    tests, errors = build_test_tree(suite, start_dir)
+
+    # Build tree
+    assert is_same_tree(expected, tests)
+    assert len(errors) == 0
+
+
+def test_build_empty_tree() -> None:
+    start_dir = path.join(path.dirname(__file__), ".data")
+    pattern = "does_not_exist*"
+
+    expected = None
+
+    loader = unittest.TestLoader()
+    suite = loader.discover(start_dir, pattern)
+    tests, errors = build_test_tree(suite, start_dir)
+
+    # Build tree
+    assert expected == tests
+    assert len(errors) == 0
diff --git a/pythonFiles/unittestadapter/utils.py b/pythonFiles/unittestadapter/utils.py
index 2a6ae06924dc..2b627d507622 100644
--- a/pythonFiles/unittestadapter/utils.py
+++ b/pythonFiles/unittestadapter/utils.py
@@ -103,6 +103,8 @@ def build_test_tree(
 ) -> Tuple[TestNode, List[str]]:
     """
     Build a test tree from a unittest test suite.
+    This function returns the test tree, and any errors found by unittest.
+    If no tests were discovered, return None and a list of errors (if any).
 
     Test tree structure:
     {
@@ -115,17 +117,17 @@ def build_test_tree(
             {
                 "path": <file path>,
                 "name": filename.py,
-                "type": "file",
+                "type_": "file",
                 "children": [
                     {
                         "path": <class path>,
                         "name": <class name>,
-                        "type": "class",
+                        "type_": "class",
                         "children": [
                             {
                                 "path": <test path>,
                                 "name": <test name>,
-                                "type": "test",
+                                "type_": "test",
                                 "lineno": <line number>
                                 "id": <test case id>,
                             }

From df1c3ae688f13f2706c2e3588a201f3170839b6a Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Thu, 6 Jan 2022 15:48:32 -0800
Subject: [PATCH 18/87] Add copyright header

---
 pythonFiles/unittestadapter/__init__.py  | 2 ++
 pythonFiles/unittestadapter/discovery.py | 9 +++++++++
 pythonFiles/unittestadapter/utils.py     | 3 +++
 3 files changed, 14 insertions(+)
 create mode 100644 pythonFiles/unittestadapter/__init__.py

diff --git a/pythonFiles/unittestadapter/__init__.py b/pythonFiles/unittestadapter/__init__.py
new file mode 100644
index 000000000000..5b7f7a925cc0
--- /dev/null
+++ b/pythonFiles/unittestadapter/__init__.py
@@ -0,0 +1,2 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
diff --git a/pythonFiles/unittestadapter/discovery.py b/pythonFiles/unittestadapter/discovery.py
index dd215acb4465..0f1fe434d44d 100644
--- a/pythonFiles/unittestadapter/discovery.py
+++ b/pythonFiles/unittestadapter/discovery.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 import getopt
 import os
 from typing import Any, Dict, List, Tuple
@@ -83,6 +86,12 @@ def discover_tests(start_dir, pattern, top_level_dir) -> Dict[str, Any]:
     #     "tests": <test tree>
     # }
 
+    # Payload format for a successful discovery with no tests:
+    # {
+    #     "status": "success",
+    #     "cwd": <test discovery directory>,
+    # }
+
     # Payload format when there are errors:
     # {
     #     "cwd": <test discovery directory>
diff --git a/pythonFiles/unittestadapter/utils.py b/pythonFiles/unittestadapter/utils.py
index 2b627d507622..a974e84c82ed 100644
--- a/pythonFiles/unittestadapter/utils.py
+++ b/pythonFiles/unittestadapter/utils.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from enum import Enum
 import inspect
 import pathlib

From bf1c1e2467fc648656320969222a230639da8256 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Thu, 6 Jan 2022 15:55:03 -0800
Subject: [PATCH 19/87] Forgot that header

---
 pythonFiles/tests/unittestadapter/__init__.py | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 pythonFiles/tests/unittestadapter/__init__.py

diff --git a/pythonFiles/tests/unittestadapter/__init__.py b/pythonFiles/tests/unittestadapter/__init__.py
new file mode 100644
index 000000000000..5b7f7a925cc0
--- /dev/null
+++ b/pythonFiles/tests/unittestadapter/__init__.py
@@ -0,0 +1,2 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.

From 6b8030e4d6d7dc86910ecac409c38a43db250751 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Thu, 6 Jan 2022 16:33:14 -0800
Subject: [PATCH 20/87] Debugging tests, they work on my machine :(

---
 pythonFiles/tests/unittestadapter/test_utils.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pythonFiles/tests/unittestadapter/test_utils.py b/pythonFiles/tests/unittestadapter/test_utils.py
index 92e97af4cc7a..3dd5746e1589 100644
--- a/pythonFiles/tests/unittestadapter/test_utils.py
+++ b/pythonFiles/tests/unittestadapter/test_utils.py
@@ -218,6 +218,12 @@ def test_build_simple_tree() -> None:
     tests, errors = build_test_tree(suite, start_dir)
 
     # Build tree
+    print("***** EXPECTED")
+    print(expected)
+    print("***** ACTUAL")
+    print(tests)
+    print("***** END")
+
     assert is_same_tree(expected, tests)
     assert len(errors) == 0
 

From ac629e04230628255c4017413ad51d497bd74983 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Thu, 6 Jan 2022 17:05:46 -0800
Subject: [PATCH 21/87] Use pathlib everywhere

---
 .../tests/unittestadapter/test_utils.py       | 21 +++++++++++--------
 pythonFiles/unittestadapter/utils.py          |  4 ++--
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/pythonFiles/tests/unittestadapter/test_utils.py b/pythonFiles/tests/unittestadapter/test_utils.py
index 3dd5746e1589..a0f73d25f281 100644
--- a/pythonFiles/tests/unittestadapter/test_utils.py
+++ b/pythonFiles/tests/unittestadapter/test_utils.py
@@ -2,8 +2,8 @@
 # Licensed under the MIT License.
 
 import unittest
+from pathlib import Path, PurePath
 
-from os import path
 from unittestadapter.utils import (
     build_test_tree,
     get_child_node,
@@ -12,13 +12,15 @@
     TestNodeTypeEnum,
 )
 
+TEST_DATA_PATH = Path(Path(__file__).parent, ".data")
+
 
 def test_simple_test_cases() -> None:
     expected = ["utils_case_one.CaseOne.test_one", "utils_case_one.CaseOne.test_two"]
     actual = []
 
     # Discover tests in .data/utils_case_one.py
-    start_dir = path.join(path.dirname(__file__), ".data")
+    start_dir = TEST_DATA_PATH.__str__()
     pattern = "utils_case_one*"
 
     loader = unittest.TestLoader()
@@ -41,7 +43,7 @@ def test_nested_test_cases() -> None:
     actual = []
 
     # Discover tests in .data/utils_case_two/
-    start_dir = path.join(path.dirname(__file__), ".data", "utils_case_two")
+    start_dir = Path(TEST_DATA_PATH, "utils_case_two").__str__()
     pattern = "file*"
 
     loader = unittest.TestLoader()
@@ -174,8 +176,9 @@ def is_same_tree(tree1, tree2) -> bool:
 
 def test_build_simple_tree() -> None:
     # Discovery tests in utils_tree_one.py
-    start_dir = path.join(path.dirname(__file__), ".data")
+    start_dir = TEST_DATA_PATH.__str__()
     pattern = "utils_tree_one*"
+    file_dir = PurePath(TEST_DATA_PATH, "utils_tree_one.py").__str__()
 
     expected: TestNode = {
         "path": start_dir,
@@ -185,24 +188,24 @@ def test_build_simple_tree() -> None:
             {
                 "name": "utils_tree_one.py",
                 "type_": TestNodeTypeEnum.file,
-                "path": path.join(start_dir, "utils_tree_one.py"),
+                "path": file_dir,
                 "children": [
                     {
                         "name": "TreeOne",
-                        "path": path.join(start_dir, "utils_tree_one.py"),
+                        "path": file_dir,
                         "type_": TestNodeTypeEnum.class_,
                         "children": [
                             {
                                 "id_": "utils_tree_one.TreeOne.test_one",
                                 "name": "test_one",
-                                "path": path.join(start_dir, "utils_tree_one.py"),
+                                "path": file_dir,
                                 "type_": TestNodeTypeEnum.test,
                                 "lineno": "13",
                             },
                             {
                                 "id_": "utils_tree_one.TreeOne.test_two",
                                 "name": "test_two",
-                                "path": path.join(start_dir, "utils_tree_one.py"),
+                                "path": file_dir,
                                 "type_": TestNodeTypeEnum.test,
                                 "lineno": "16",
                             },
@@ -229,7 +232,7 @@ def test_build_simple_tree() -> None:
 
 
 def test_build_empty_tree() -> None:
-    start_dir = path.join(path.dirname(__file__), ".data")
+    start_dir = TEST_DATA_PATH.__str__()
     pattern = "does_not_exist*"
 
     expected = None
diff --git a/pythonFiles/unittestadapter/utils.py b/pythonFiles/unittestadapter/utils.py
index a974e84c82ed..9f330a724912 100644
--- a/pythonFiles/unittestadapter/utils.py
+++ b/pythonFiles/unittestadapter/utils.py
@@ -164,14 +164,14 @@ def build_test_tree(
             for folder in folders:
                 current_node = get_child_node(
                     folder,
-                    f'{current_node["path"]}/{folder}',
+                    pathlib.PurePath(current_node["path"], folder).__str__(),
                     TestNodeTypeEnum.folder,
                     current_node,
                 )
 
             # Find/build file node
             path_components = [test_directory] + folders + [py_filename]
-            file_path = "/".join(path_components)
+            file_path = pathlib.PurePath("/".join(path_components)).__str__()
             current_node = get_child_node(
                 py_filename, file_path, TestNodeTypeEnum.file, current_node
             )

From a0828771bccaf3367b75ba8fabf1a7df159708c3 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Thu, 6 Jan 2022 17:07:04 -0800
Subject: [PATCH 22/87] News entry

---
 news/1 Enhancements/17242.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/1 Enhancements/17242.md

diff --git a/news/1 Enhancements/17242.md b/news/1 Enhancements/17242.md
new file mode 100644
index 000000000000..204de1ba5158
--- /dev/null
+++ b/news/1 Enhancements/17242.md	
@@ -0,0 +1 @@
+Rewrite support for unittest test discovery.

From fec6118356a7368168006179540df053663d3581 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Fri, 7 Jan 2022 11:04:04 -0800
Subject: [PATCH 23/87] Add docstrings to utils tests + fix nested case

---
 .../.data/utils_case_two/folder/__init__.py   |  2 ++
 .../utils_case_two/{ => folder}/file_two.py   |  0
 .../tests/unittestadapter/test_utils.py       | 36 ++++++++++++++-----
 3 files changed, 29 insertions(+), 9 deletions(-)
 create mode 100644 pythonFiles/tests/unittestadapter/.data/utils_case_two/folder/__init__.py
 rename pythonFiles/tests/unittestadapter/.data/utils_case_two/{ => folder}/file_two.py (100%)

diff --git a/pythonFiles/tests/unittestadapter/.data/utils_case_two/folder/__init__.py b/pythonFiles/tests/unittestadapter/.data/utils_case_two/folder/__init__.py
new file mode 100644
index 000000000000..5b7f7a925cc0
--- /dev/null
+++ b/pythonFiles/tests/unittestadapter/.data/utils_case_two/folder/__init__.py
@@ -0,0 +1,2 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
diff --git a/pythonFiles/tests/unittestadapter/.data/utils_case_two/file_two.py b/pythonFiles/tests/unittestadapter/.data/utils_case_two/folder/file_two.py
similarity index 100%
rename from pythonFiles/tests/unittestadapter/.data/utils_case_two/file_two.py
rename to pythonFiles/tests/unittestadapter/.data/utils_case_two/folder/file_two.py
diff --git a/pythonFiles/tests/unittestadapter/test_utils.py b/pythonFiles/tests/unittestadapter/test_utils.py
index a0f73d25f281..535e28954da1 100644
--- a/pythonFiles/tests/unittestadapter/test_utils.py
+++ b/pythonFiles/tests/unittestadapter/test_utils.py
@@ -16,6 +16,10 @@
 
 
 def test_simple_test_cases() -> None:
+    """
+    The get_test_case fuction should return tests from the test suite.
+    """
+
     expected = ["utils_case_one.CaseOne.test_one", "utils_case_one.CaseOne.test_two"]
     actual = []
 
@@ -34,11 +38,16 @@ def test_simple_test_cases() -> None:
 
 
 def test_nested_test_cases() -> None:
+    """
+    The get_test_case fuction should return tests from all test suites,
+    even those in subfolders.
+    """
+
     expected = [
         "file_one.CaseTwoFileOne.test_one",
         "file_one.CaseTwoFileOne.test_two",
-        "file_two.CaseTwoFileTwo.test_one",
-        "file_two.CaseTwoFileTwo.test_two",
+        "folder.file_two.CaseTwoFileTwo.test_one",
+        "folder.file_two.CaseTwoFileTwo.test_two",
     ]
     actual = []
 
@@ -57,6 +66,10 @@ def test_nested_test_cases() -> None:
 
 
 def test_get_existing_child_node() -> None:
+    """
+    The get_child_node fuction should return the child node of a test tree if it exists.
+    """
+
     tree = {
         "name": "root",
         "path": "foo",
@@ -99,6 +112,10 @@ def test_get_existing_child_node() -> None:
 
 
 def test_no_existing_child_node() -> None:
+    """
+    The get_child_node fuction should add a child node to a test tree and return it if it does not exist.
+    """
+
     tree: TestNode = {
         "name": "root",
         "path": "foo",
@@ -175,6 +192,10 @@ def is_same_tree(tree1, tree2) -> bool:
 
 
 def test_build_simple_tree() -> None:
+    """
+    The build_test_tree fuction should build and return a test tree from discovered test suites, and a list of errors if there are any, or an empty list otherwise .
+    """
+
     # Discovery tests in utils_tree_one.py
     start_dir = TEST_DATA_PATH.__str__()
     pattern = "utils_tree_one*"
@@ -220,18 +241,15 @@ def test_build_simple_tree() -> None:
     suite = loader.discover(start_dir, pattern)
     tests, errors = build_test_tree(suite, start_dir)
 
-    # Build tree
-    print("***** EXPECTED")
-    print(expected)
-    print("***** ACTUAL")
-    print(tests)
-    print("***** END")
-
     assert is_same_tree(expected, tests)
     assert len(errors) == 0
 
 
 def test_build_empty_tree() -> None:
+    """
+    The build_test_tree fuction should return None if there are no discovered test suites, and a list of errors if there are any, or an empty list otherwise .
+    """
+
     start_dir = TEST_DATA_PATH.__str__()
     pattern = "does_not_exist*"
 

From 8e89d63a0d4be6ad89148613f5e9bd218df82c50 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Fri, 7 Jan 2022 11:12:09 -0800
Subject: [PATCH 24/87] Rename utils tests data + delete unused files

---
 .../file_one.py                               |  0
 .../folder/__init__.py                        |  0
 .../folder/file_two.py                        |  0
 ...tils_case_one.py => utils_simple_cases.py} |  0
 ...utils_tree_one.py => utils_simple_tree.py} |  0
 .../.data/utils_tree_three/file_one.py        | 18 ------------------
 .../.data/utils_tree_three/file_two.py        | 19 -------------------
 .../tests/unittestadapter/test_utils.py       | 19 +++++++++++--------
 8 files changed, 11 insertions(+), 45 deletions(-)
 rename pythonFiles/tests/unittestadapter/.data/{utils_case_two => utils_nested_cases}/file_one.py (100%)
 rename pythonFiles/tests/unittestadapter/.data/{utils_case_two => utils_nested_cases}/folder/__init__.py (100%)
 rename pythonFiles/tests/unittestadapter/.data/{utils_case_two => utils_nested_cases}/folder/file_two.py (100%)
 rename pythonFiles/tests/unittestadapter/.data/{utils_case_one.py => utils_simple_cases.py} (100%)
 rename pythonFiles/tests/unittestadapter/.data/{utils_tree_one.py => utils_simple_tree.py} (100%)
 delete mode 100644 pythonFiles/tests/unittestadapter/.data/utils_tree_three/file_one.py
 delete mode 100644 pythonFiles/tests/unittestadapter/.data/utils_tree_three/file_two.py

diff --git a/pythonFiles/tests/unittestadapter/.data/utils_case_two/file_one.py b/pythonFiles/tests/unittestadapter/.data/utils_nested_cases/file_one.py
similarity index 100%
rename from pythonFiles/tests/unittestadapter/.data/utils_case_two/file_one.py
rename to pythonFiles/tests/unittestadapter/.data/utils_nested_cases/file_one.py
diff --git a/pythonFiles/tests/unittestadapter/.data/utils_case_two/folder/__init__.py b/pythonFiles/tests/unittestadapter/.data/utils_nested_cases/folder/__init__.py
similarity index 100%
rename from pythonFiles/tests/unittestadapter/.data/utils_case_two/folder/__init__.py
rename to pythonFiles/tests/unittestadapter/.data/utils_nested_cases/folder/__init__.py
diff --git a/pythonFiles/tests/unittestadapter/.data/utils_case_two/folder/file_two.py b/pythonFiles/tests/unittestadapter/.data/utils_nested_cases/folder/file_two.py
similarity index 100%
rename from pythonFiles/tests/unittestadapter/.data/utils_case_two/folder/file_two.py
rename to pythonFiles/tests/unittestadapter/.data/utils_nested_cases/folder/file_two.py
diff --git a/pythonFiles/tests/unittestadapter/.data/utils_case_one.py b/pythonFiles/tests/unittestadapter/.data/utils_simple_cases.py
similarity index 100%
rename from pythonFiles/tests/unittestadapter/.data/utils_case_one.py
rename to pythonFiles/tests/unittestadapter/.data/utils_simple_cases.py
diff --git a/pythonFiles/tests/unittestadapter/.data/utils_tree_one.py b/pythonFiles/tests/unittestadapter/.data/utils_simple_tree.py
similarity index 100%
rename from pythonFiles/tests/unittestadapter/.data/utils_tree_one.py
rename to pythonFiles/tests/unittestadapter/.data/utils_simple_tree.py
diff --git a/pythonFiles/tests/unittestadapter/.data/utils_tree_three/file_one.py b/pythonFiles/tests/unittestadapter/.data/utils_tree_three/file_one.py
deleted file mode 100644
index 16fcecfc9c8d..000000000000
--- a/pythonFiles/tests/unittestadapter/.data/utils_tree_three/file_one.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-import unittest
-
-
-class TreeThreeFileOne(unittest.TestCase):
-    """
-    Test class for the test_build_error_tree test.
-    build_test_tree should build a test tree with the valid test cases,
-    and return error messages for the failed discovered tests.
-    """
-
-    def test_one(self) -> None:
-        self.assertGreater(2, 1)
-
-    def test_two(self) -> None:
-        self.assertNotEqual(2, 1)
diff --git a/pythonFiles/tests/unittestadapter/.data/utils_tree_three/file_two.py b/pythonFiles/tests/unittestadapter/.data/utils_tree_three/file_two.py
deleted file mode 100644
index c8cc217f0ec9..000000000000
--- a/pythonFiles/tests/unittestadapter/.data/utils_tree_three/file_two.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-import unittest
-import something_else
-
-
-class TreeThreeFileTwo(unittest.TestCase):
-    """
-    Test class for the test_build_error_tree test.
-    build_test_tree should build a test tree with the valid test cases,
-    and return error messages for the failed discovered tests.
-    """
-
-    def test_one(self) -> None:
-        self.assertGreater(2, 1)
-
-    def test_two(self) -> None:
-        self.assertNotEqual(2, 1)
diff --git a/pythonFiles/tests/unittestadapter/test_utils.py b/pythonFiles/tests/unittestadapter/test_utils.py
index 535e28954da1..45382da92b31 100644
--- a/pythonFiles/tests/unittestadapter/test_utils.py
+++ b/pythonFiles/tests/unittestadapter/test_utils.py
@@ -20,12 +20,15 @@ def test_simple_test_cases() -> None:
     The get_test_case fuction should return tests from the test suite.
     """
 
-    expected = ["utils_case_one.CaseOne.test_one", "utils_case_one.CaseOne.test_two"]
+    expected = [
+        "utils_simple_cases.CaseOne.test_one",
+        "utils_simple_cases.CaseOne.test_two",
+    ]
     actual = []
 
     # Discover tests in .data/utils_case_one.py
     start_dir = TEST_DATA_PATH.__str__()
-    pattern = "utils_case_one*"
+    pattern = "utils_simple_cases*"
 
     loader = unittest.TestLoader()
     suite = loader.discover(start_dir, pattern)
@@ -52,7 +55,7 @@ def test_nested_test_cases() -> None:
     actual = []
 
     # Discover tests in .data/utils_case_two/
-    start_dir = Path(TEST_DATA_PATH, "utils_case_two").__str__()
+    start_dir = Path(TEST_DATA_PATH, "utils_nested_cases").__str__()
     pattern = "file*"
 
     loader = unittest.TestLoader()
@@ -198,8 +201,8 @@ def test_build_simple_tree() -> None:
 
     # Discovery tests in utils_tree_one.py
     start_dir = TEST_DATA_PATH.__str__()
-    pattern = "utils_tree_one*"
-    file_dir = PurePath(TEST_DATA_PATH, "utils_tree_one.py").__str__()
+    pattern = "utils_simple_tree*"
+    file_dir = PurePath(TEST_DATA_PATH, "utils_simple_tree.py").__str__()
 
     expected: TestNode = {
         "path": start_dir,
@@ -207,7 +210,7 @@ def test_build_simple_tree() -> None:
         "name": ".data",
         "children": [
             {
-                "name": "utils_tree_one.py",
+                "name": "utils_simple_tree.py",
                 "type_": TestNodeTypeEnum.file,
                 "path": file_dir,
                 "children": [
@@ -217,14 +220,14 @@ def test_build_simple_tree() -> None:
                         "type_": TestNodeTypeEnum.class_,
                         "children": [
                             {
-                                "id_": "utils_tree_one.TreeOne.test_one",
+                                "id_": "utils_simple_tree.TreeOne.test_one",
                                 "name": "test_one",
                                 "path": file_dir,
                                 "type_": TestNodeTypeEnum.test,
                                 "lineno": "13",
                             },
                             {
-                                "id_": "utils_tree_one.TreeOne.test_two",
+                                "id_": "utils_simple_tree.TreeOne.test_two",
                                 "name": "test_two",
                                 "path": file_dir,
                                 "type_": TestNodeTypeEnum.test,

From 66b41bed1bdcb100c810cd6d22453efe841f5271 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Fri, 7 Jan 2022 13:05:43 -0800
Subject: [PATCH 25/87] Discovery tests

---
 .../unittestadapter/.data/discovery_empty.py  |  15 ++
 .../.data/discovery_error/file_one.py         |  20 ++
 .../.data/discovery_error/file_two.py         |  18 ++
 .../unittestadapter/.data/discovery_simple.py |  18 ++
 pythonFiles/tests/unittestadapter/__init__.py |  35 +++
 .../tests/unittestadapter/test_discovery.py   | 227 ++++++++++++++++++
 .../tests/unittestadapter/test_utils.py       |  36 +--
 pythonFiles/unittestadapter/discovery.py      |  21 +-
 8 files changed, 347 insertions(+), 43 deletions(-)
 create mode 100644 pythonFiles/tests/unittestadapter/.data/discovery_empty.py
 create mode 100644 pythonFiles/tests/unittestadapter/.data/discovery_error/file_one.py
 create mode 100644 pythonFiles/tests/unittestadapter/.data/discovery_error/file_two.py
 create mode 100644 pythonFiles/tests/unittestadapter/.data/discovery_simple.py
 create mode 100644 pythonFiles/tests/unittestadapter/test_discovery.py

diff --git a/pythonFiles/tests/unittestadapter/.data/discovery_empty.py b/pythonFiles/tests/unittestadapter/.data/discovery_empty.py
new file mode 100644
index 000000000000..c489845c437d
--- /dev/null
+++ b/pythonFiles/tests/unittestadapter/.data/discovery_empty.py
@@ -0,0 +1,15 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+import unittest
+
+
+class DiscoveryEmpty(unittest.TestCase):
+    """
+    Test class for the test_empty_discovery test.
+    The discover_tests function should return a dictionary with a "success" status, no errors, and no test tree
+    if unittest discovery was performed successfully but no tests were found.
+    """
+
+    def something() -> None:
+        return True
diff --git a/pythonFiles/tests/unittestadapter/.data/discovery_error/file_one.py b/pythonFiles/tests/unittestadapter/.data/discovery_error/file_one.py
new file mode 100644
index 000000000000..d9a9a2754b85
--- /dev/null
+++ b/pythonFiles/tests/unittestadapter/.data/discovery_error/file_one.py
@@ -0,0 +1,20 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+import unittest
+
+import something_else
+
+
+class DiscoveryErrorOne(unittest.TestCase):
+    """
+    Test class for the test_error_discovery test.
+    The discover_tests function should return a dictionary with an "error" status, the discovered tests, and a list of errors
+    if unittest discovery failed at some point.
+    """
+
+    def test_one(self) -> None:
+        self.assertGreater(2, 1)
+
+    def test_two(self) -> None:
+        self.assertNotEqual(2, 1)
diff --git a/pythonFiles/tests/unittestadapter/.data/discovery_error/file_two.py b/pythonFiles/tests/unittestadapter/.data/discovery_error/file_two.py
new file mode 100644
index 000000000000..babca2206af5
--- /dev/null
+++ b/pythonFiles/tests/unittestadapter/.data/discovery_error/file_two.py
@@ -0,0 +1,18 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+import unittest
+
+
+class DiscoveryErrorTwo(unittest.TestCase):
+    """
+    Test class for the test_error_discovery test.
+    The discover_tests function should return a dictionary with an "error" status, the discovered tests, and a list of errors
+    if unittest discovery failed at some point.
+    """
+
+    def test_one(self) -> None:
+        self.assertGreater(2, 1)
+
+    def test_two(self) -> None:
+        self.assertNotEqual(2, 1)
diff --git a/pythonFiles/tests/unittestadapter/.data/discovery_simple.py b/pythonFiles/tests/unittestadapter/.data/discovery_simple.py
new file mode 100644
index 000000000000..53ceb79c3deb
--- /dev/null
+++ b/pythonFiles/tests/unittestadapter/.data/discovery_simple.py
@@ -0,0 +1,18 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+import unittest
+
+
+class DiscoverySimple(unittest.TestCase):
+    """
+    Test class for the test_simple_discovery test.
+    The discover_tests function should return a dictionary with a "success" status, no errors, and a test tree
+    if unittest discovery was performed successfully.
+    """
+
+    def test_one(self) -> None:
+        self.assertGreater(2, 1)
+
+    def test_two(self) -> None:
+        self.assertNotEqual(2, 1)
diff --git a/pythonFiles/tests/unittestadapter/__init__.py b/pythonFiles/tests/unittestadapter/__init__.py
index 5b7f7a925cc0..767dc21def06 100644
--- a/pythonFiles/tests/unittestadapter/__init__.py
+++ b/pythonFiles/tests/unittestadapter/__init__.py
@@ -1,2 +1,37 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
+
+from pathlib import Path
+
+TEST_DATA_PATH = Path(Path(__file__).parent, ".data")
+
+# Helper function to test if two test trees are the same.
+def is_same_tree(tree1, tree2) -> bool:
+    # Compare the root
+    if (
+        tree1["path"] != tree2["path"]
+        or tree1["name"] != tree2["name"]
+        or tree1["type_"] != tree2["type_"]
+    ):
+        return False
+
+    # Compare child test nodes if they exist, otherwise compare test items.
+    if "children" in tree1 and "children" in tree2:
+        children1 = tree1["children"]
+        children2 = tree2["children"]
+
+        # Compare test nodes
+        if len(children1) != len(children2):
+            return False
+        else:
+            result = True
+            index = 0
+            while index < len(children1) and result == True:
+                result = result and is_same_tree(children1[index], children2[index])
+                index = index + 1
+            return result
+    elif "id_" in tree1 and "id_" in tree2:
+        # Compare test items
+        return tree1["id_"] == tree2["id_"] and tree1["lineno"] == tree2["lineno"]
+
+    return False
diff --git a/pythonFiles/tests/unittestadapter/test_discovery.py b/pythonFiles/tests/unittestadapter/test_discovery.py
new file mode 100644
index 000000000000..1ea2945f3289
--- /dev/null
+++ b/pythonFiles/tests/unittestadapter/test_discovery.py
@@ -0,0 +1,227 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+from pathlib import PurePath
+
+from unittestadapter.discovery import (
+    DEFAULT_PORT,
+    discover_tests,
+    parse_port,
+    parse_unittest_args,
+)
+from unittestadapter.utils import TestNodeTypeEnum
+
+from . import TEST_DATA_PATH, is_same_tree
+
+
+def test_parse_port_option() -> None:
+    """
+    The parse_port function should parse and return the port passed as a command-line option.
+    """
+
+    expected = 9999
+    args = [("--port", expected)]
+
+    actual = parse_port(args)
+
+    assert expected == actual
+
+
+def test_parse_no_port_option() -> None:
+    """
+    The parse_port function should return a default port value if there was no --port command-line option.
+    """
+
+    args = [("--foo", "something"), ("--bar", "another")]
+
+    actual = parse_port(args)
+
+    assert DEFAULT_PORT == actual
+
+
+def test_parse_short_unittest_args() -> None:
+    """
+    The parse_unittest_args function should return the values for the start_dir, pattern, and top_level_dir arguments
+    when passed as command-line options with their shorthand form.
+    """
+
+    expected_start_dir = "foo"
+    expected_pattern = "bar*"
+    expected_top_level_dir = "baz"
+    args = [
+        ("-s", expected_start_dir),
+        ("-p", expected_pattern),
+        ("-t", expected_top_level_dir),
+    ]
+
+    actual_start_dir, actual_pattern, actual_top_level_dir = parse_unittest_args(args)
+
+    assert expected_start_dir == actual_start_dir
+    assert expected_pattern == actual_pattern
+    assert expected_top_level_dir == actual_top_level_dir
+
+
+def test_parse_long_unittest_args() -> None:
+    """
+    The parse_unittest_args function should return the values for the start_dir, pattern, and top_level_dir arguments
+    when passed as command-line options with their long form.
+    """
+
+    expected_start_dir = "foo"
+    expected_pattern = "bar*"
+    expected_top_level_dir = "baz"
+    args = [
+        ("--start-directory", expected_start_dir),
+        ("--pattern", expected_pattern),
+        ("--top-level-directory", expected_top_level_dir),
+    ]
+
+    actual_start_dir, actual_pattern, actual_top_level_dir = parse_unittest_args(args)
+
+    assert expected_start_dir == actual_start_dir
+    assert expected_pattern == actual_pattern
+    assert expected_top_level_dir == actual_top_level_dir
+
+
+def test_parse_no_unittest_args() -> None:
+    """
+    The parse_unittest_args function should return default values for the start_dir, pattern, and top_level_dir arguments
+    if they were not passed as command-line options, and ignore unrecognized arguments.
+    """
+
+    expected_start_dir = "."
+    expected_pattern = "test*.py"
+    expected_top_level_dir = None
+    args = [
+        ("--foo", "something"),
+    ]
+
+    actual_start_dir, actual_pattern, actual_top_level_dir = parse_unittest_args(args)
+
+    assert expected_start_dir == actual_start_dir
+    assert expected_pattern == actual_pattern
+    assert expected_top_level_dir == actual_top_level_dir
+
+
+def test_simple_discovery() -> None:
+    """
+    The discover_tests function should return a dictionary with a "success" status, no errors, and a test tree
+    if unittest discovery was performed successfully.
+    """
+
+    start_dir = TEST_DATA_PATH.__str__()
+    pattern = "discovery_simple*"
+    file_path = PurePath(TEST_DATA_PATH, "discovery_simple.py").__str__()
+
+    expected = {
+        "path": start_dir,
+        "type_": TestNodeTypeEnum.folder,
+        "name": ".data",
+        "children": [
+            {
+                "name": "discovery_simple.py",
+                "type_": TestNodeTypeEnum.file,
+                "path": file_path,
+                "children": [
+                    {
+                        "name": "DiscoverySimple",
+                        "path": file_path,
+                        "type_": TestNodeTypeEnum.class_,
+                        "children": [
+                            {
+                                "id_": "discovery_simple.DiscoverySimple.test_one",
+                                "name": "test_one",
+                                "path": file_path,
+                                "type_": TestNodeTypeEnum.test,
+                                "lineno": "14",
+                            },
+                            {
+                                "id_": "discovery_simple.DiscoverySimple.test_two",
+                                "name": "test_two",
+                                "path": file_path,
+                                "type_": TestNodeTypeEnum.test,
+                                "lineno": "17",
+                            },
+                        ],
+                    }
+                ],
+            }
+        ],
+    }
+
+    actual = discover_tests(start_dir, pattern, None)
+
+    assert actual["status"] == "success"
+    assert is_same_tree(actual["tests"], expected)
+    assert "errors" not in actual
+
+
+def test_empty_discovery() -> None:
+    """
+    The discover_tests function should return a dictionary with a "success" status, no errors, and no test tree
+    if unittest discovery was performed successfully but no tests were found.
+    """
+
+    start_dir = TEST_DATA_PATH.__str__()
+    pattern = "discovery_empty*"
+
+    actual = discover_tests(start_dir, pattern, None)
+
+    assert actual["status"] == "success"
+    assert "tests" not in actual
+    assert "errors" not in actual
+
+
+def test_error_discovery() -> None:
+    """
+    The discover_tests function should return a dictionary with an "error" status, the discovered tests, and a list of errors
+    if unittest discovery failed at some point.
+    """
+
+    # Discover tests in .data/discovery_error/
+    start_dir = PurePath(TEST_DATA_PATH, "discovery_error").__str__()
+    pattern = "file*"
+
+    file_path = PurePath(start_dir, "file_two.py").__str__()
+
+    expected = {
+        "path": start_dir,
+        "type_": TestNodeTypeEnum.folder,
+        "name": "discovery_error",
+        "children": [
+            {
+                "name": "file_two.py",
+                "type_": TestNodeTypeEnum.file,
+                "path": file_path,
+                "children": [
+                    {
+                        "name": "DiscoveryErrorTwo",
+                        "path": file_path,
+                        "type_": TestNodeTypeEnum.class_,
+                        "children": [
+                            {
+                                "id_": "discovery_error.DiscoveryErrorTwo.test_one",
+                                "name": "test_one",
+                                "path": file_path,
+                                "type_": TestNodeTypeEnum.test,
+                                "lineno": "14",
+                            },
+                            {
+                                "id_": "discovery_error.DiscoveryErrorTwo.test_two",
+                                "name": "test_two",
+                                "path": file_path,
+                                "type_": TestNodeTypeEnum.test,
+                                "lineno": "17",
+                            },
+                        ],
+                    }
+                ],
+            }
+        ],
+    }
+
+    actual = discover_tests(start_dir, pattern, None)
+
+    assert actual["status"] == "error"
+    is_same_tree(expected, actual["tests"])
+    assert len(actual["errors"]) == 1
diff --git a/pythonFiles/tests/unittestadapter/test_utils.py b/pythonFiles/tests/unittestadapter/test_utils.py
index 45382da92b31..f37bfa8c5bb5 100644
--- a/pythonFiles/tests/unittestadapter/test_utils.py
+++ b/pythonFiles/tests/unittestadapter/test_utils.py
@@ -2,7 +2,7 @@
 # Licensed under the MIT License.
 
 import unittest
-from pathlib import Path, PurePath
+from pathlib import PurePath
 
 from unittestadapter.utils import (
     build_test_tree,
@@ -12,7 +12,7 @@
     TestNodeTypeEnum,
 )
 
-TEST_DATA_PATH = Path(Path(__file__).parent, ".data")
+from . import is_same_tree, TEST_DATA_PATH
 
 
 def test_simple_test_cases() -> None:
@@ -162,38 +162,6 @@ def test_no_existing_child_node() -> None:
     assert initial_len < post_len
 
 
-# Helper function to test if two test trees are the same.
-def is_same_tree(tree1, tree2) -> bool:
-    # Compare the root
-    if (
-        tree1["path"] != tree2["path"]
-        or tree1["name"] != tree2["name"]
-        or tree1["type_"] != tree2["type_"]
-    ):
-        return False
-
-    # Compare child test nodes if they exist, otherwise compare test items.
-    if "children" in tree1 and "children" in tree2:
-        children1 = tree1["children"]
-        children2 = tree2["children"]
-
-        # Compare test nodes
-        if len(children1) != len(children2):
-            return False
-        else:
-            result = True
-            index = 0
-            while index < len(children1) and result == True:
-                result = result and is_same_tree(children1[index], children2[index])
-                index = index + 1
-            return result
-    elif "id_" in tree1 and "id_" in tree2:
-        # Compare test items
-        return tree1["id_"] == tree2["id_"] and tree1["lineno"] == tree2["lineno"]
-
-    return False
-
-
 def test_build_simple_tree() -> None:
     """
     The build_test_tree fuction should build and return a test tree from discovered test suites, and a list of errors if there are any, or an empty list otherwise .
diff --git a/pythonFiles/unittestadapter/discovery.py b/pythonFiles/unittestadapter/discovery.py
index 0f1fe434d44d..c91ee7948912 100644
--- a/pythonFiles/unittestadapter/discovery.py
+++ b/pythonFiles/unittestadapter/discovery.py
@@ -8,7 +8,7 @@
 import traceback
 import unittest
 
-from utils import build_test_tree
+from .utils import build_test_tree
 
 
 # Add the lib path to our sys path to find the requests module.
@@ -22,6 +22,8 @@
 
 Arguments = Tuple[str, Any]
 
+DEFAULT_PORT = 45454
+
 
 def parse_port(args: List[Arguments]) -> int:
     """
@@ -29,8 +31,8 @@ def parse_port(args: List[Arguments]) -> int:
     for example the port number that it needs to connect to.
     """
     # The port is passed to the discovery.py script when it is executed,
-    # defaults to 45454 if it can't be parsed.
-    port = 45454
+    # defaults to DEFAULT_PORT if it can't be parsed.
+    port = DEFAULT_PORT
     for opt in args:
         if opt[0] == "--port":
             port = opt[1]
@@ -40,17 +42,18 @@ def parse_port(args: List[Arguments]) -> int:
 def parse_unittest_args(args: List[Arguments]) -> Tuple[str, str, str]:
     """
     Parse command-line arguments that should be forwarded to unittest.
-    Unittest arguments are: -v, -s, -p, -t, in that order.
+    Unittest arguments are: -v, -s, -p, -t.
     """
     pattern = "test*.py"
+    start_dir = "."
     top_level_dir = None
 
     for opt in args:
-        if opt[0] == "-s":
+        if opt[0] in ("-s", "--start-directory"):
             start_dir = opt[1]
-        elif opt[0] == "-p":
+        elif opt[0] in ("-p", "--pattern"):
             pattern = opt[1]
-        elif opt[0] == "-t":
+        elif opt[0] in ("-t", "--top-level-directory"):
             top_level_dir = opt[1]
 
     return start_dir, pattern, top_level_dir
@@ -58,7 +61,7 @@ def parse_unittest_args(args: List[Arguments]) -> Tuple[str, str, str]:
 
 def discover_tests(start_dir, pattern, top_level_dir) -> Dict[str, Any]:
     cwd = os.path.abspath(start_dir)
-    payload = {"cwd": cwd}
+    payload = {"cwd": cwd, "status": "success"}
     tests = None
     errors = []
 
@@ -68,13 +71,13 @@ def discover_tests(start_dir, pattern, top_level_dir) -> Dict[str, Any]:
 
         tests, errors = build_test_tree(suite, cwd)
     except:
-        payload["status"] = "error"
         errors.append(traceback.format_exc())
 
     if tests is not None:
         payload["tests"] = tests
 
     if len(errors):
+        payload["status"] = "error"
         payload["errors"] = errors
 
     # Connect to the TypeScript side and send payload.

From b440762bcf579f24d4260ed71865c3a435b45489 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Fri, 7 Jan 2022 13:05:53 -0800
Subject: [PATCH 26/87] Fix comments in utils tests

---
 .../tests/unittestadapter/test_utils.py       | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pythonFiles/tests/unittestadapter/test_utils.py b/pythonFiles/tests/unittestadapter/test_utils.py
index f37bfa8c5bb5..68be645da16f 100644
--- a/pythonFiles/tests/unittestadapter/test_utils.py
+++ b/pythonFiles/tests/unittestadapter/test_utils.py
@@ -26,7 +26,7 @@ def test_simple_test_cases() -> None:
     ]
     actual = []
 
-    # Discover tests in .data/utils_case_one.py
+    # Discover tests in .data/utils_simple_cases.py
     start_dir = TEST_DATA_PATH.__str__()
     pattern = "utils_simple_cases*"
 
@@ -54,8 +54,8 @@ def test_nested_test_cases() -> None:
     ]
     actual = []
 
-    # Discover tests in .data/utils_case_two/
-    start_dir = Path(TEST_DATA_PATH, "utils_nested_cases").__str__()
+    # Discover tests in .data/utils_nested_cases/
+    start_dir = PurePath(TEST_DATA_PATH, "utils_nested_cases").__str__()
     pattern = "file*"
 
     loader = unittest.TestLoader()
@@ -164,13 +164,13 @@ def test_no_existing_child_node() -> None:
 
 def test_build_simple_tree() -> None:
     """
-    The build_test_tree fuction should build and return a test tree from discovered test suites, and a list of errors if there are any, or an empty list otherwise .
+    The build_test_tree function should build and return a test tree from discovered test suites, and an empty list of errors if there are none in the discovered data.
     """
 
-    # Discovery tests in utils_tree_one.py
+    # Discovery tests in utils_simple_tree.py
     start_dir = TEST_DATA_PATH.__str__()
     pattern = "utils_simple_tree*"
-    file_dir = PurePath(TEST_DATA_PATH, "utils_simple_tree.py").__str__()
+    file_path = PurePath(TEST_DATA_PATH, "utils_simple_tree.py").__str__()
 
     expected: TestNode = {
         "path": start_dir,
@@ -180,24 +180,24 @@ def test_build_simple_tree() -> None:
             {
                 "name": "utils_simple_tree.py",
                 "type_": TestNodeTypeEnum.file,
-                "path": file_dir,
+                "path": file_path,
                 "children": [
                     {
                         "name": "TreeOne",
-                        "path": file_dir,
+                        "path": file_path,
                         "type_": TestNodeTypeEnum.class_,
                         "children": [
                             {
                                 "id_": "utils_simple_tree.TreeOne.test_one",
                                 "name": "test_one",
-                                "path": file_dir,
+                                "path": file_path,
                                 "type_": TestNodeTypeEnum.test,
                                 "lineno": "13",
                             },
                             {
                                 "id_": "utils_simple_tree.TreeOne.test_two",
                                 "name": "test_two",
-                                "path": file_dir,
+                                "path": file_path,
                                 "type_": TestNodeTypeEnum.test,
                                 "lineno": "16",
                             },
@@ -218,7 +218,7 @@ def test_build_simple_tree() -> None:
 
 def test_build_empty_tree() -> None:
     """
-    The build_test_tree fuction should return None if there are no discovered test suites, and a list of errors if there are any, or an empty list otherwise .
+    The build_test_tree function should return None if there are no discovered test suites, and an empty list of errors if there are none in the discovered data
     """
 
     start_dir = TEST_DATA_PATH.__str__()

From e6454f83cf0b0a5f57a88ad511696164ba893cb2 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Fri, 7 Jan 2022 15:03:14 -0800
Subject: [PATCH 27/87] Update comments + requirements

---
 pythonFiles/tests/unittestadapter/__init__.py       | 4 ++++
 pythonFiles/tests/unittestadapter/test_discovery.py | 8 --------
 pythonFiles/unittestadapter/discovery.py            | 7 +++++++
 pythonFiles/unittestadapter/utils.py                | 1 -
 requirements.in                                     | 2 +-
 requirements.txt                                    | 8 ++++----
 6 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/pythonFiles/tests/unittestadapter/__init__.py b/pythonFiles/tests/unittestadapter/__init__.py
index 767dc21def06..3cc8b65cdee8 100644
--- a/pythonFiles/tests/unittestadapter/__init__.py
+++ b/pythonFiles/tests/unittestadapter/__init__.py
@@ -7,6 +7,10 @@
 
 # Helper function to test if two test trees are the same.
 def is_same_tree(tree1, tree2) -> bool:
+    """
+    Helper function to test if two test trees are the same by comparing the root attributes,
+    and checking if all children are the same.
+    """
     # Compare the root
     if (
         tree1["path"] != tree2["path"]
diff --git a/pythonFiles/tests/unittestadapter/test_discovery.py b/pythonFiles/tests/unittestadapter/test_discovery.py
index 1ea2945f3289..e550edbacb1c 100644
--- a/pythonFiles/tests/unittestadapter/test_discovery.py
+++ b/pythonFiles/tests/unittestadapter/test_discovery.py
@@ -18,7 +18,6 @@ def test_parse_port_option() -> None:
     """
     The parse_port function should parse and return the port passed as a command-line option.
     """
-
     expected = 9999
     args = [("--port", expected)]
 
@@ -31,7 +30,6 @@ def test_parse_no_port_option() -> None:
     """
     The parse_port function should return a default port value if there was no --port command-line option.
     """
-
     args = [("--foo", "something"), ("--bar", "another")]
 
     actual = parse_port(args)
@@ -44,7 +42,6 @@ def test_parse_short_unittest_args() -> None:
     The parse_unittest_args function should return the values for the start_dir, pattern, and top_level_dir arguments
     when passed as command-line options with their shorthand form.
     """
-
     expected_start_dir = "foo"
     expected_pattern = "bar*"
     expected_top_level_dir = "baz"
@@ -66,7 +63,6 @@ def test_parse_long_unittest_args() -> None:
     The parse_unittest_args function should return the values for the start_dir, pattern, and top_level_dir arguments
     when passed as command-line options with their long form.
     """
-
     expected_start_dir = "foo"
     expected_pattern = "bar*"
     expected_top_level_dir = "baz"
@@ -88,7 +84,6 @@ def test_parse_no_unittest_args() -> None:
     The parse_unittest_args function should return default values for the start_dir, pattern, and top_level_dir arguments
     if they were not passed as command-line options, and ignore unrecognized arguments.
     """
-
     expected_start_dir = "."
     expected_pattern = "test*.py"
     expected_top_level_dir = None
@@ -108,7 +103,6 @@ def test_simple_discovery() -> None:
     The discover_tests function should return a dictionary with a "success" status, no errors, and a test tree
     if unittest discovery was performed successfully.
     """
-
     start_dir = TEST_DATA_PATH.__str__()
     pattern = "discovery_simple*"
     file_path = PurePath(TEST_DATA_PATH, "discovery_simple.py").__str__()
@@ -161,7 +155,6 @@ def test_empty_discovery() -> None:
     The discover_tests function should return a dictionary with a "success" status, no errors, and no test tree
     if unittest discovery was performed successfully but no tests were found.
     """
-
     start_dir = TEST_DATA_PATH.__str__()
     pattern = "discovery_empty*"
 
@@ -177,7 +170,6 @@ def test_error_discovery() -> None:
     The discover_tests function should return a dictionary with an "error" status, the discovered tests, and a list of errors
     if unittest discovery failed at some point.
     """
-
     # Discover tests in .data/discovery_error/
     start_dir = PurePath(TEST_DATA_PATH, "discovery_error").__str__()
     pattern = "file*"
diff --git a/pythonFiles/unittestadapter/discovery.py b/pythonFiles/unittestadapter/discovery.py
index c91ee7948912..7759f98405a8 100644
--- a/pythonFiles/unittestadapter/discovery.py
+++ b/pythonFiles/unittestadapter/discovery.py
@@ -60,6 +60,13 @@ def parse_unittest_args(args: List[Arguments]) -> Tuple[str, str, str]:
 
 
 def discover_tests(start_dir, pattern, top_level_dir) -> Dict[str, Any]:
+    """
+    Unittest test discovery function, that returns a payload dictionary with the following keys:
+    - cwd: Absolute path to the test start directory;
+    - status: Test discovery status, can be "success" or "error";
+    - tests: Discoverered tests if any, not present otherwise. Note that the status can be "error" but the payload can still contain tests;
+    - errors: Discovery errors if any, not present otherwise.
+    """
     cwd = os.path.abspath(start_dir)
     payload = {"cwd": cwd, "status": "success"}
     tests = None
diff --git a/pythonFiles/unittestadapter/utils.py b/pythonFiles/unittestadapter/utils.py
index 9f330a724912..51187361ff21 100644
--- a/pythonFiles/unittestadapter/utils.py
+++ b/pythonFiles/unittestadapter/utils.py
@@ -141,7 +141,6 @@ def build_test_tree(
         ]
     }
     """
-
     errors = []
     directory_path = pathlib.PurePath(test_directory)
     root = build_test_node(test_directory, directory_path.name, TestNodeTypeEnum.folder)
diff --git a/requirements.in b/requirements.in
index a0c12c649d62..9eb22fa67ceb 100644
--- a/requirements.in
+++ b/requirements.in
@@ -4,7 +4,7 @@
 # 2) pip-compile --generate-hashes requirements.in
 
 # Unittest test adapter
-requests==2.26.0
+requests==2.27.1
 
 # Sort Imports
 isort==5.10.0
diff --git a/requirements.txt b/requirements.txt
index c9a4c0d8c17a..283517459201 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.6
 # To update, run:
 #
 #    pip-compile --generate-hashes requirements.in
@@ -20,9 +20,9 @@ isort==5.10.0 \
     --hash=sha256:1a18ccace2ed8910bd9458b74a3ecbafd7b2f581301b0ab65cfdd4338272d76f \
     --hash=sha256:e52ff6d38012b131628cf0f26c51e7bd3a7c81592eefe3ac71411e692f1b9345
     # via -r requirements.in
-requests==2.26.0 \
-    --hash=sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24 \
-    --hash=sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7
+requests==2.27.1 \
+    --hash=sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61 \
+    --hash=sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d
     # via -r requirements.in
 urllib3==1.26.7 \
     --hash=sha256:4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece \

From d9d40aba9b7872227062d15a0899ba8f7c9b0e81 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Fri, 7 Jan 2022 16:32:45 -0800
Subject: [PATCH 28/87] Add comments in the TS code, remove console logs

---
 .../testController/common/commandRunner.ts    |  4 ++++
 .../unittest/testDiscoveryAdapter.ts          |  3 +++
 .../testController/workspaceTestAdapter.ts    | 21 +++++++++----------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/client/testing/testController/common/commandRunner.ts b/src/client/testing/testController/common/commandRunner.ts
index b5752b3e3711..0e1f4bbb9217 100644
--- a/src/client/testing/testController/common/commandRunner.ts
+++ b/src/client/testing/testController/common/commandRunner.ts
@@ -9,6 +9,10 @@ import {
 import { createDeferred } from '../../../common/utils/async';
 import { TestCommandOptions } from '../../common/types';
 
+/**
+ * Helper function that will send the unittest discovery command, wait for a reply from the Python script, and return the data.
+ * It is up to the caller to parse this data into a JSON object.
+ */
 export async function runTestCommand(
     executionFactory: IPythonExecutionFactory,
     options: TestCommandOptions,
diff --git a/src/client/testing/testController/unittest/testDiscoveryAdapter.ts b/src/client/testing/testController/unittest/testDiscoveryAdapter.ts
index f4feacfeaa44..6f8129f932d9 100644
--- a/src/client/testing/testController/unittest/testDiscoveryAdapter.ts
+++ b/src/client/testing/testController/unittest/testDiscoveryAdapter.ts
@@ -10,6 +10,9 @@ import { TestCommandOptions } from '../../common/types';
 import { runTestCommand } from '../common/commandRunner';
 import { DiscoveredTestPayload, ITestDiscoveryAdapter } from '../common/types';
 
+/**
+ * Wrapper class for unittest test discovery. This is where we call `runTestCommand`.
+ */
 export class UnittestTestDiscoveryAdapter implements ITestDiscoveryAdapter {
     constructor(
         public executionFactory: IPythonExecutionFactory,
diff --git a/src/client/testing/testController/workspaceTestAdapter.ts b/src/client/testing/testController/workspaceTestAdapter.ts
index 1f876eed434e..5435a89e60f2 100644
--- a/src/client/testing/testController/workspaceTestAdapter.ts
+++ b/src/client/testing/testController/workspaceTestAdapter.ts
@@ -18,6 +18,15 @@ import { DiscoveredTestItem, DiscoveredTestNode, DiscoveredTestType, ITestDiscov
 import { DEFAULT_TEST_PORT } from './common/utils';
 import { UnittestTestDiscoveryAdapter } from './unittest/testDiscoveryAdapter';
 
+/**
+ * This class exposes a test-provider-agnostic way of discovering tests.
+ *
+ * It gets instantiated by the `PythonTestController` class in charge of reflecting test data in the UI,
+ * and then instantiates provider-specific adapters under the hood depending on settings.
+ *
+ * This class formats the JSON test data returned by the `UnittestTestDiscoveryAdapter` into test UI elements,
+ * and uses them to insert/update/remove items in the `TestController` instance behind the testing UI whenever the `PythonTestController` requests a refresh.
+ */
 export class WorkspaceTestAdapter {
     private discoveryAdapter: ITestDiscoveryAdapter;
 
@@ -25,6 +34,7 @@ export class WorkspaceTestAdapter {
 
     private testData: DiscoveredTestNode | undefined;
 
+    // TODO: Implement test running
     // private running: ITestRunningAdapter;
 
     constructor(
@@ -54,8 +64,6 @@ export class WorkspaceTestAdapter {
     ): Promise<void> {
         sendTelemetryEvent(EventName.UNITTEST_DISCOVERING, undefined, { tool: 'unittest' });
 
-        console.warn(`discovery uri: ${uri.fsPath}`);
-
         // The uri parameter can differ from the workspace uri when we're in a multiroot workspace scenario.
         // As such, we don't rely on this.workspaceUri
         const workspace = this.workspaceService.getWorkspaceFolder(uri);
@@ -160,25 +168,18 @@ export class WorkspaceTestAdapter {
                     // If the test root for this folder exists: Workspace refresh, update its children.
                     // Otherwise, it is a freshly discovered workspace, and we need to create a new test root and populate the test tree.
                     if (workspaceNode) {
-                        console.warn(`Update test tree with:`);
-                        console.warn(rawTestData);
                         updateTestTree(testController, rawTestData.tests, this.testData, workspaceNode, token);
                     } else {
-                        console.warn(`Populate test tree with:`);
-                        console.warn(rawTestData);
                         populateTestTree(testController, rawTestData.tests, undefined, token);
                     }
                 } else {
                     // Delete everything from the test controller.
-                    console.warn(`Delete everything from the test controller.`);
                     testController.items.replace([]);
                 }
 
                 // Save new test data state.
                 this.testData = rawTestData.tests;
             }
-
-            console.warn(this.testData);
         }
 
         sendTelemetryEvent(EventName.UNITTEST_DISCOVERY_DONE, undefined, { tool: 'unittest', failed: false });
@@ -288,8 +289,6 @@ function populateTestTree(
     testRoot: TestItem | undefined,
     token?: CancellationToken,
 ): void {
-    console.warn(`populate test tree:`);
-    console.warn(testTreeData);
     // If testRoot is undefined, use the info of the root item of testTreeData to create a test item, and append it to the test controller.
     if (!testRoot) {
         testRoot = testController.createTestItem(testTreeData.path, testTreeData.name, Uri.file(testTreeData.path));

From 4582a99de313f97ecc5cd47ae72551baf340b34e Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Sat, 8 Jan 2022 10:26:04 -0800
Subject: [PATCH 29/87] Add tests for commandRunner.ts

---
 .../testController/common/commandRunner.ts    |   8 +-
 .../testController/commandRunner.unit.test.ts | 135 ++++++++++++++++++
 2 files changed, 141 insertions(+), 2 deletions(-)
 create mode 100644 src/test/testing/testController/commandRunner.unit.test.ts

diff --git a/src/client/testing/testController/common/commandRunner.ts b/src/client/testing/testController/common/commandRunner.ts
index 0e1f4bbb9217..55653a8ed926 100644
--- a/src/client/testing/testController/common/commandRunner.ts
+++ b/src/client/testing/testController/common/commandRunner.ts
@@ -10,8 +10,10 @@ import { createDeferred } from '../../../common/utils/async';
 import { TestCommandOptions } from '../../common/types';
 
 /**
- * Helper function that will send the unittest discovery command, wait for a reply from the Python script, and return the data.
- * It is up to the caller to parse this data into a JSON object.
+ * Helper function that will communicate with a Python script via a "client/server" architecture.
+ * The TS side will send a command to a Python script, and spawn a server that will listen for a reply from the Python side.
+ * Once the reply is received, it will close down the server and resolve the resulting promise with the data as a string.
+ * It is up to the caller to parse this data into a JSON object if necessary.
  */
 export async function runTestCommand(
     executionFactory: IPythonExecutionFactory,
@@ -64,6 +66,8 @@ export async function runTestCommand(
         try {
             await execService.exec(options.args, spawnOptions);
         } catch (ex) {
+            // Close the connection.
+            server.close();
             deferred.reject(ex);
         }
     });
diff --git a/src/test/testing/testController/commandRunner.unit.test.ts b/src/test/testing/testController/commandRunner.unit.test.ts
new file mode 100644
index 000000000000..d93af3e685c4
--- /dev/null
+++ b/src/test/testing/testController/commandRunner.unit.test.ts
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import * as assert from 'assert';
+import * as http from 'http';
+import { OutputChannel, Uri } from 'vscode';
+import { IPythonExecutionFactory, IPythonExecutionService } from '../../../client/common/process/types';
+import { TestCommandOptions } from '../../../client/testing/common/types';
+import { runTestCommand } from '../../../client/testing/testController/common/commandRunner';
+
+suite('Python command runner', () => {
+    let stubExecutionFactory: IPythonExecutionFactory;
+    let stubExecService: IPythonExecutionService;
+
+    setup(() => {
+        stubExecService = ({
+            exec: async (args: string[]) => {
+                fakeExecutedScript(args.join(' '));
+                return Promise.resolve({
+                    stdout: '',
+                });
+            },
+        } as unknown) as IPythonExecutionService;
+
+        stubExecutionFactory = ({
+            createActivatedEnvironment: async () => Promise.resolve(stubExecService),
+        } as unknown) as IPythonExecutionFactory;
+    });
+
+    // Fake Python script called by the runTestCommand function.
+    // This function will parse the command arg for the server port, and the mock data to return.
+    function fakeExecutedScript(command: string): void {
+        // Parse data
+        const args = command.split(' ');
+        const portIndex = args.indexOf('--port');
+        const dataIndex = args.indexOf('--data');
+
+        const port = args[portIndex + 1];
+        const data = args[dataIndex + 1];
+
+        // Return data
+        const options = {
+            hostname: 'localhost',
+            port,
+            method: 'POST',
+        };
+        const request = http.request(options);
+        request.write(JSON.stringify({ data }));
+        request.end();
+    }
+
+    function buildCommandOptions(data = 'foo', port = 6789): TestCommandOptions {
+        return {
+            workspaceFolder: Uri.parse('foo'),
+            port,
+            cwd: 'foo',
+            args: ['scriptName', '--port', `${port}`, '--data', data],
+            ignoreCache: true,
+        };
+    }
+
+    test('Should resolve with a string if the command was successful', async () => {
+        const options = buildCommandOptions();
+
+        const result = await runTestCommand(stubExecutionFactory, options);
+
+        assert.strictEqual(result, '{"data":"foo"}');
+    });
+
+    test('Should reject the promise if the command failed', async () => {
+        const options = buildCommandOptions();
+
+        stubExecService = ({
+            exec: async () => Promise.reject(new Error('foo')),
+        } as unknown) as IPythonExecutionService;
+
+        assert.rejects(runTestCommand(stubExecutionFactory, options));
+    });
+
+    test('Should write in an output channel if the outputChannel option was passed', async () => {
+        let output = '';
+
+        const stubOutputChannel: OutputChannel = ({
+            appendLine: (line: string) => {
+                output += line;
+            },
+        } as unknown) as OutputChannel;
+
+        const data = 'bar';
+        const options = buildCommandOptions(data);
+        options.outChannel = stubOutputChannel;
+
+        await runTestCommand(stubExecutionFactory, options);
+
+        assert.strictEqual(output, `python scriptName --port ${options.port} --data ${data}`);
+    });
+
+    test('Should close the server if the command was successful', async () => {
+        // Run runTestCommand
+        const port = 6788;
+        const options = buildCommandOptions('foo', port);
+
+        await runTestCommand(stubExecutionFactory, options);
+
+        // Try to create a server listening to the same port
+        const server = http.createServer();
+        server.listen(port);
+
+        assert.ok(server.listening);
+
+        // Close that server
+        server.close();
+    });
+
+    test('Should close the server if the command failed', async () => {
+        // Run runTestCommand
+        const port = 6788;
+        const options = buildCommandOptions('foo', port);
+
+        stubExecService = ({
+            exec: async () => Promise.reject(new Error('foo')),
+        } as unknown) as IPythonExecutionService;
+
+        assert.rejects(runTestCommand(stubExecutionFactory, options));
+
+        // Try to create a server listening to the same port
+        const server = http.createServer();
+        server.listen(port);
+
+        assert.ok(server.listening);
+
+        // Close that server
+        server.close();
+    });
+});

From 44162d1e757da2e9083b13bc2d9cfd530bcd3dad Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Sat, 8 Jan 2022 11:18:37 -0800
Subject: [PATCH 30/87] Add tests for unittest/testDiscoveryAdapter.ts

---
 .../testDiscoveryAdapter.unit.test.ts         | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 src/test/testing/testController/unittest/testDiscoveryAdapter.unit.test.ts

diff --git a/src/test/testing/testController/unittest/testDiscoveryAdapter.unit.test.ts b/src/test/testing/testController/unittest/testDiscoveryAdapter.unit.test.ts
new file mode 100644
index 000000000000..1a79241f8ef1
--- /dev/null
+++ b/src/test/testing/testController/unittest/testDiscoveryAdapter.unit.test.ts
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import * as assert from 'assert';
+import * as sinon from 'sinon';
+import { Uri } from 'vscode';
+import * as commandRunner from '../../../../client/testing/testController/common/commandRunner';
+import { IPythonExecutionFactory } from '../../../../client/common/process/types';
+import { IConfigurationService } from '../../../../client/common/types';
+import { UnittestTestDiscoveryAdapter } from '../../../../client/testing/testController/unittest/testDiscoveryAdapter';
+
+suite('Unittest test discovery adapter', () => {
+    let stubExecutionFactory: IPythonExecutionFactory;
+    let stubConfigSettings: IConfigurationService;
+
+    const sandbox = sinon.createSandbox();
+
+    setup(() => {
+        stubExecutionFactory = ({} as unknown) as IPythonExecutionFactory;
+
+        stubConfigSettings = ({
+            getSettings: () => ({
+                testing: { unittestArgs: ['-v', '-s', '.', '-p', 'test*'] },
+            }),
+        } as unknown) as IConfigurationService;
+    });
+
+    teardown(() => {
+        sandbox.restore();
+    });
+
+    test('discoverTests should return a JSON object if the command executed successfully', async () => {
+        const stubRunTestCommand = sandbox.stub(commandRunner, 'runTestCommand');
+        stubRunTestCommand.resolves('{"data":"something"}');
+
+        const adapter = new UnittestTestDiscoveryAdapter(stubExecutionFactory, stubConfigSettings, 6789);
+
+        const result = await adapter.discoverTests(Uri.parse('foo'));
+
+        assert.deepStrictEqual(result, { data: 'something' });
+    });
+
+    test('discoverTests should throw an error if the command fails', async () => {
+        const stubRunTestCommand = sandbox.stub(commandRunner, 'runTestCommand');
+        stubRunTestCommand.rejects(new Error('an error'));
+
+        const adapter = new UnittestTestDiscoveryAdapter(stubExecutionFactory, stubConfigSettings, 6789);
+
+        assert.rejects(adapter.discoverTests(Uri.parse('foo')));
+    });
+});

From 200c547f5bda5e3697cea584f36002e1d7899b36 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Sat, 8 Jan 2022 13:56:01 -0800
Subject: [PATCH 31/87] Add temp tests for workspaceTestAdapter.ts

---
 .../testing/testController/controller.ts      |   5 +-
 .../testController/workspaceTestAdapter.ts    | 209 +++++++++---------
 .../workspaceTestAdapter.unit.test.ts         | 197 +++++++++++++++++
 3 files changed, 299 insertions(+), 112 deletions(-)
 create mode 100644 src/test/testing/testController/workspaceTestAdapter.unit.test.ts

diff --git a/src/client/testing/testController/controller.ts b/src/client/testing/testController/controller.ts
index 15cb96f6837c..e00022b38d70 100644
--- a/src/client/testing/testController/controller.ts
+++ b/src/client/testing/testController/controller.ts
@@ -155,7 +155,6 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
                     this.testAdapters.get(uri) || (this.testAdapters.values().next().value as WorkspaceTestAdapter);
                 testAdapter.discoverTests(
                     this.testController,
-                    uri,
                     this.refreshCancellation.token,
                     this.testAdapters.size > 1,
                     this.workspaceService.workspaceFile?.fsPath || Common.workspace(),
@@ -314,10 +313,10 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
             const settings = this.configSettings.getSettings(workspace.uri);
             const workspaceTestAdapter = new WorkspaceTestAdapter(
                 'unittest',
+                workspace.uri,
+                i,
                 this.pythonExecFactory,
-                this.workspaceService,
                 this.configSettings,
-                i,
             );
 
             this.testAdapters.set(workspace.uri, workspaceTestAdapter);
diff --git a/src/client/testing/testController/workspaceTestAdapter.ts b/src/client/testing/testController/workspaceTestAdapter.ts
index 5435a89e60f2..1024a92ad85d 100644
--- a/src/client/testing/testController/workspaceTestAdapter.ts
+++ b/src/client/testing/testController/workspaceTestAdapter.ts
@@ -4,7 +4,6 @@
 import * as path from 'path';
 import * as util from 'util';
 import { CancellationToken, Position, Range, TestController, TestItem, Uri } from 'vscode';
-import { IWorkspaceService } from '../../common/application/types';
 import { IPythonExecutionFactory } from '../../common/process/types';
 import { IConfigurationService } from '../../common/types';
 import { createDeferred, Deferred } from '../../common/utils/async';
@@ -30,7 +29,7 @@ import { UnittestTestDiscoveryAdapter } from './unittest/testDiscoveryAdapter';
 export class WorkspaceTestAdapter {
     private discoveryAdapter: ITestDiscoveryAdapter;
 
-    private discovering: Map<string, Deferred<void>> = new Map();
+    private discovering: Deferred<void> | undefined = undefined;
 
     private testData: DiscoveredTestNode | undefined;
 
@@ -38,11 +37,11 @@ export class WorkspaceTestAdapter {
     // private running: ITestRunningAdapter;
 
     constructor(
-        public testProvider: TestProvider,
+        private testProvider: TestProvider,
+        private workspaceUri: Uri,
+        index: number,
         executionFactory: IPythonExecutionFactory,
-        private workspaceService: IWorkspaceService,
         configSettings: IConfigurationService,
-        index: number,
     ) {
         if (this.testProvider === 'unittest') {
             const port = DEFAULT_TEST_PORT + index * 10;
@@ -57,132 +56,124 @@ export class WorkspaceTestAdapter {
 
     public async discoverTests(
         testController: TestController,
-        uri: Uri,
         token?: CancellationToken,
         isMultiroot?: boolean,
         workspaceFilePath?: string,
     ): Promise<void> {
-        sendTelemetryEvent(EventName.UNITTEST_DISCOVERING, undefined, { tool: 'unittest' });
-
-        // The uri parameter can differ from the workspace uri when we're in a multiroot workspace scenario.
-        // As such, we don't rely on this.workspaceUri
-        const workspace = this.workspaceService.getWorkspaceFolder(uri);
-
-        if (workspace) {
-            // Discovery is expensive. If it is already running, use the existing promise.
-            const discoveryUri = workspace.uri;
-            const previous = this.discovering.get(discoveryUri.fsPath);
-            if (previous) {
-                return previous.promise;
-            }
+        sendTelemetryEvent(EventName.UNITTEST_DISCOVERING, undefined, { tool: this.testProvider });
 
-            const deferred = createDeferred<void>();
-            this.discovering.set(discoveryUri.fsPath, deferred);
+        const workspacePath = this.workspaceUri.fsPath;
 
-            let rawTestData;
-            try {
-                rawTestData = await this.discoveryAdapter.discoverTests(discoveryUri);
+        // Discovery is expensive. If it is already running, use the existing promise.
+        if (this.discovering) {
+            return this.discovering.promise;
+        }
 
-                deferred.resolve();
-            } catch (ex) {
-                sendTelemetryEvent(EventName.UNITTEST_DISCOVERY_DONE, undefined, { tool: 'unittest', failed: true });
+        const deferred = createDeferred<void>();
+        this.discovering = deferred;
 
-                const cancel = token?.isCancellationRequested
-                    ? Testing.cancelUnittestDiscovery()
-                    : Testing.errorUnittestDiscovery();
+        let rawTestData;
+        try {
+            rawTestData = await this.discoveryAdapter.discoverTests(this.workspaceUri);
 
-                traceError(`${cancel}\r\n`, ex);
+            deferred.resolve();
+        } catch (ex) {
+            sendTelemetryEvent(EventName.UNITTEST_DISCOVERY_DONE, undefined, { tool: this.testProvider, failed: true });
 
-                // Report also on the test view.
-                const message = util.format(`${cancel} ${Testing.seePythonOutput()}\r\n`, ex);
-                const options = buildErrorNodeOptions(discoveryUri, message);
-                const errorNode = createErrorTestItem(testController, options);
-                testController.items.add(errorNode);
+            const cancel = token?.isCancellationRequested
+                ? Testing.cancelUnittestDiscovery()
+                : Testing.errorUnittestDiscovery();
 
-                deferred.reject(ex as Error);
-            } finally {
-                // Discovery has finished running, we have the data,
-                // we don't need the deferred promise anymore.
-                this.discovering.delete(discoveryUri.fsPath);
-            }
+            traceError(`${cancel}\r\n`, ex);
 
-            if (!rawTestData) {
-                // No test data is available
-                return Promise.resolve();
-            }
+            // Report also on the test view.
+            const message = util.format(`${cancel} ${Testing.seePythonOutput()}\r\n`, ex);
+            const options = buildErrorNodeOptions(this.workspaceUri, message);
+            const errorNode = createErrorTestItem(testController, options);
+            testController.items.add(errorNode);
 
-            // Check if there were any errors in the discovery process.
-            if (rawTestData.status === 'error') {
-                const { errors } = rawTestData;
-                traceError(Testing.errorUnittestDiscovery(), '\r\n', errors!.join('\r\n\r\n'));
+            deferred.reject(ex as Error);
+        } finally {
+            // Discovery has finished running, we have the data,
+            // we don't need the deferred promise anymore.
+            this.discovering = undefined;
+        }
 
-                let errorNode = testController.items.get(`DiscoveryError:${uri.fsPath}`);
-                const message = util.format(
-                    `${Testing.errorUnittestDiscovery()} ${Testing.seePythonOutput()}\r\n`,
-                    errors!.join('\r\n\r\n'),
-                );
+        if (!rawTestData) {
+            // No test data is available
+            return Promise.resolve();
+        }
 
-                if (errorNode === undefined) {
-                    const options = buildErrorNodeOptions(discoveryUri, message);
-                    errorNode = createErrorTestItem(testController, options);
-                    testController.items.add(errorNode);
-                }
-                errorNode.error = message;
+        // Check if there were any errors in the discovery process.
+        if (rawTestData.status === 'error') {
+            const { errors } = rawTestData;
+            traceError(Testing.errorUnittestDiscovery(), '\r\n', errors!.join('\r\n\r\n'));
+
+            let errorNode = testController.items.get(`DiscoveryError:${workspacePath}`);
+            const message = util.format(
+                `${Testing.errorUnittestDiscovery()} ${Testing.seePythonOutput()}\r\n`,
+                errors!.join('\r\n\r\n'),
+            );
+
+            if (errorNode === undefined) {
+                const options = buildErrorNodeOptions(this.workspaceUri, message);
+                errorNode = createErrorTestItem(testController, options);
+                testController.items.add(errorNode);
+            }
+            errorNode.error = message;
+        } else {
+            // Remove the error node if necessary,
+            // then parse and insert test data.
+            testController.items.delete(`DiscoveryError:${workspacePath}`);
+
+            // If we are in a multiroot workspace scenario, find the overall root in the test UI (should be the workspace file name),
+            // then wrap the current folder's test result in a tree under the overall root + the current folder name.
+            let workspaceNode: TestItem | undefined;
+            if (isMultiroot && workspaceFilePath) {
+                const rootFilename = path.basename(workspaceFilePath);
+                workspaceNode = testController.items.get(workspaceFilePath);
+
+                const wrappedTests = rawTestData.tests;
+
+                const children = [
+                    {
+                        path: workspacePath,
+                        name: path.basename(workspacePath),
+                        type_: 'folder' as DiscoveredTestType,
+                        children: wrappedTests ? [wrappedTests] : [],
+                    },
+                ];
+
+                rawTestData.tests = {
+                    path: workspaceFilePath,
+                    name: rootFilename,
+                    type_: 'folder',
+                    children,
+                };
             } else {
-                // Remove the error node if necessary,
-                // then parse and insert test data.
-                testController.items.delete(`DiscoveryError:${discoveryUri.fsPath}`);
-
-                // If we are in a multiroot workspace scenario, find the overall root (should be the workspace file name),
-                // And wrap the current folder's test result in a tree under the overall root + the current folder name.
-                let workspaceNode: TestItem | undefined;
-                if (isMultiroot && workspaceFilePath) {
-                    const rootFilename = path.basename(workspaceFilePath);
-                    workspaceNode = testController.items.get(workspaceFilePath);
-
-                    const workspacePath = workspace.uri.fsPath;
-                    const wrappedTests = rawTestData.tests;
-
-                    const children = [
-                        {
-                            path: workspacePath,
-                            name: path.basename(workspacePath),
-                            type_: 'folder' as DiscoveredTestType,
-                            children: wrappedTests ? [wrappedTests] : [],
-                        },
-                    ];
-
-                    rawTestData.tests = {
-                        path: workspaceFilePath,
-                        name: rootFilename,
-                        type_: 'folder',
-                        children,
-                    };
-                } else {
-                    // Find the root for this test data in the test controller.
-                    const rootPath = rawTestData.cwd;
-                    workspaceNode = testController.items.get(rootPath);
-                }
+                // Find the root for this test data in the test controller.
+                const rootPath = rawTestData.cwd;
+                workspaceNode = testController.items.get(rootPath);
+            }
 
-                if (rawTestData.tests) {
-                    // If the test root for this folder exists: Workspace refresh, update its children.
-                    // Otherwise, it is a freshly discovered workspace, and we need to create a new test root and populate the test tree.
-                    if (workspaceNode) {
-                        updateTestTree(testController, rawTestData.tests, this.testData, workspaceNode, token);
-                    } else {
-                        populateTestTree(testController, rawTestData.tests, undefined, token);
-                    }
+            if (rawTestData.tests) {
+                // If the test root for this folder exists: Workspace refresh, update its children.
+                // Otherwise, it is a freshly discovered workspace, and we need to create a new test root and populate the test tree.
+                if (workspaceNode) {
+                    updateTestTree(testController, rawTestData.tests, this.testData, workspaceNode, token);
                 } else {
-                    // Delete everything from the test controller.
-                    testController.items.replace([]);
+                    populateTestTree(testController, rawTestData.tests, undefined, token);
                 }
-
-                // Save new test data state.
-                this.testData = rawTestData.tests;
+            } else {
+                // Delete everything from the test controller.
+                testController.items.replace([]);
             }
+
+            // Save new test data state.
+            this.testData = rawTestData.tests;
         }
 
-        sendTelemetryEvent(EventName.UNITTEST_DISCOVERY_DONE, undefined, { tool: 'unittest', failed: false });
+        sendTelemetryEvent(EventName.UNITTEST_DISCOVERY_DONE, undefined, { tool: this.testProvider, failed: false });
         return Promise.resolve();
     }
 }
diff --git a/src/test/testing/testController/workspaceTestAdapter.unit.test.ts b/src/test/testing/testController/workspaceTestAdapter.unit.test.ts
new file mode 100644
index 000000000000..11cb20f2e107
--- /dev/null
+++ b/src/test/testing/testController/workspaceTestAdapter.unit.test.ts
@@ -0,0 +1,197 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import * as assert from 'assert';
+import * as sinon from 'sinon';
+
+import { TestController, TestItem, Uri } from 'vscode';
+import { IPythonExecutionFactory } from '../../../client/common/process/types';
+import { IConfigurationService } from '../../../client/common/types';
+import { UnittestTestDiscoveryAdapter } from '../../../client/testing/testController/unittest/testDiscoveryAdapter';
+import { WorkspaceTestAdapter } from '../../../client/testing/testController/workspaceTestAdapter';
+import * as Telemetry from '../../../client/telemetry';
+import { EventName } from '../../../client/telemetry/constants';
+
+suite('Workspace test adapter', () => {
+    suite('Test discovery', () => {
+        let stubExecutionFactory: IPythonExecutionFactory;
+        let stubConfigSettings: IConfigurationService;
+
+        let discoverTestsStub: sinon.SinonStub;
+        let sendTelemetryStub: sinon.SinonStub;
+
+        let telemetryEvent: { eventName: EventName; properties: Record<string, unknown> }[] = [];
+
+        // Stubbed test controller (see comment around L.40)
+        let testController: TestController;
+        let log: string[] = [];
+
+        const sandbox = sinon.createSandbox();
+
+        setup(() => {
+            stubExecutionFactory = ({} as unknown) as IPythonExecutionFactory;
+
+            stubConfigSettings = ({
+                getSettings: () => ({
+                    testing: { unittestArgs: ['--foo'] },
+                }),
+            } as unknown) as IConfigurationService;
+
+            // For some reason the 'tests' namespace in the proposed API is not reachable.
+            // While I figure out how to expose to the tests, they will run
+            // against a stub test controller and stub test items.
+            const testItem = ({
+                canResolveChildren: false,
+                tags: [],
+                children: {
+                    add: () => {
+                        // empty
+                    },
+                },
+            } as unknown) as TestItem;
+
+            testController = ({
+                items: {
+                    get: () => {
+                        log.push('get');
+                    },
+                    add: () => {
+                        log.push('add');
+                    },
+                    replace: () => {
+                        log.push('replace');
+                    },
+                    delete: () => {
+                        log.push('delete');
+                    },
+                },
+                createTestItem: () => {
+                    log.push('createTestItem');
+                    return testItem;
+                },
+                dispose: () => {
+                    // empty
+                },
+            } as unknown) as TestController;
+
+            // testController = tests.createTestController('mock-python-tests', 'Mock Python Tests');
+
+            const mockSendTelemetryEvent = (
+                eventName: EventName,
+                _: number | undefined,
+                properties: Record<string, unknown>,
+            ) => {
+                telemetryEvent.push({
+                    eventName,
+                    properties,
+                });
+            };
+
+            discoverTestsStub = sandbox.stub(UnittestTestDiscoveryAdapter.prototype, 'discoverTests');
+            sendTelemetryStub = sandbox.stub(Telemetry, 'sendTelemetryEvent').callsFake(mockSendTelemetryEvent);
+        });
+
+        teardown(() => {
+            telemetryEvent = [];
+            log = [];
+            testController.dispose();
+            sandbox.restore();
+        });
+
+        test('If the test provider is unittest, the workspace test adapter uses an instance of UnittestTestDiscoveryAdapter', async () => {
+            discoverTestsStub.resolves();
+
+            const workspaceTestAdapter = new WorkspaceTestAdapter(
+                'unittest',
+                Uri.parse('foo'),
+                1,
+                stubExecutionFactory,
+                stubConfigSettings,
+            );
+
+            await workspaceTestAdapter.discoverTests(testController);
+
+            sinon.assert.calledOnce(discoverTestsStub);
+        });
+
+        test('If discovery is already running, do not call discoveryAdapter.discoverTests again', async () => {
+            discoverTestsStub.callsFake(
+                async () =>
+                    new Promise<void>((resolve) => {
+                        setTimeout(() => {
+                            // Simulate time taken by discovery.
+                            resolve();
+                        }, 2000);
+                    }),
+            );
+
+            const workspaceTestAdapter = new WorkspaceTestAdapter(
+                'unittest',
+                Uri.parse('foo'),
+                1,
+                stubExecutionFactory,
+                stubConfigSettings,
+            );
+
+            // Try running discovery twice
+            const one = workspaceTestAdapter.discoverTests(testController);
+            const two = workspaceTestAdapter.discoverTests(testController);
+
+            Promise.all([one, two]);
+
+            sinon.assert.calledOnce(discoverTestsStub);
+        });
+
+        test('If discovery succeeds, send a telemetry event with the "failed" key set to false', async () => {
+            discoverTestsStub.resolves({ status: 'success' });
+
+            const workspaceTestAdapter = new WorkspaceTestAdapter(
+                'unittest',
+                Uri.parse('foo'),
+                1,
+                stubExecutionFactory,
+                stubConfigSettings,
+            );
+
+            await workspaceTestAdapter.discoverTests(testController);
+
+            sinon.assert.calledWith(sendTelemetryStub, EventName.UNITTEST_DISCOVERY_DONE);
+            assert.strictEqual(telemetryEvent.length, 2);
+
+            const lastEvent = telemetryEvent[1];
+            assert.strictEqual(lastEvent.properties.failed, false);
+        });
+
+        test('If discovery failed, send a telemetry event with the "failed" key set to true, and add an error node to the test controller', async () => {
+            discoverTestsStub.rejects(new Error('foo'));
+
+            const workspaceTestAdapter = new WorkspaceTestAdapter(
+                'unittest',
+                Uri.parse('foo'),
+                1,
+                stubExecutionFactory,
+                stubConfigSettings,
+            );
+
+            await workspaceTestAdapter.discoverTests(testController);
+
+            sinon.assert.calledWith(sendTelemetryStub, EventName.UNITTEST_DISCOVERY_DONE);
+            assert.strictEqual(telemetryEvent.length, 2);
+
+            const lastEvent = telemetryEvent[1];
+            assert.ok(lastEvent.properties.failed);
+
+            assert.deepStrictEqual(log, ['createTestItem', 'add']);
+        });
+
+        /**
+         * To test:
+         * - successful discovery but no data: delete everything from the test controller
+         * - successful discovery with error status: add error node to tree
+         * - single root: populate tree if there's no root node
+         * - single root: update tree if there's a root node
+         * - single root: delete tree if there are no tests in the test data
+         * - multiroot: update the correct folders
+         */
+    });
+});

From 73e127cdd7cb4beec40cf3a0b64256764ff9521e Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Mon, 10 Jan 2022 14:00:40 -0800
Subject: [PATCH 32/87] Use httpx instead of requests

---
 pythonFiles/unittestadapter/discovery.py |  6 +-
 requirements.in                          |  2 +-
 requirements.txt                         | 93 +++++++++++++++++++++---
 3 files changed, 86 insertions(+), 15 deletions(-)

diff --git a/pythonFiles/unittestadapter/discovery.py b/pythonFiles/unittestadapter/discovery.py
index 7759f98405a8..62bc9889c3cd 100644
--- a/pythonFiles/unittestadapter/discovery.py
+++ b/pythonFiles/unittestadapter/discovery.py
@@ -11,13 +11,13 @@
 from .utils import build_test_tree
 
 
-# Add the lib path to our sys path to find the requests module.
+# Add the lib path to our sys path to find the httpx module.
 EXTENSION_ROOT = os.path.dirname(
     os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 )
 sys.path.insert(0, os.path.join(EXTENSION_ROOT, "pythonFiles", "lib", "python"))
 
-import requests
+import httpx
 
 
 Arguments = Tuple[str, Any]
@@ -130,4 +130,4 @@ def discover_tests(start_dir, pattern, top_level_dir) -> Dict[str, Any]:
     payload = discover_tests(start_dir, pattern, top_level_dir)
 
     port = parse_port(script_args)
-    requests.post(f"http://localhost:{port}", json=payload)
+    httpx.post(f"http://localhost:{port}", data=payload)
diff --git a/requirements.in b/requirements.in
index 9eb22fa67ceb..0638c10e3747 100644
--- a/requirements.in
+++ b/requirements.in
@@ -4,7 +4,7 @@
 # 2) pip-compile --generate-hashes requirements.in
 
 # Unittest test adapter
-requests==2.27.1
+httpx==0.21.3
 
 # Sort Imports
 isort==5.10.0
diff --git a/requirements.txt b/requirements.txt
index 283517459201..e761f2a5612c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,27 +4,98 @@
 #
 #    pip-compile --generate-hashes requirements.in
 #
+anyio==3.4.0 \
+    --hash=sha256:24adc69309fb5779bc1e06158e143e0b6d2c56b302a3ac3de3083c705a6ed39d \
+    --hash=sha256:2855a9423524abcdd652d942f8932fda1735210f77a6b392eafd9ff34d3fe020
+    # via httpcore
+async-generator==1.10 \
+    --hash=sha256:01c7bf666359b4967d2cda0000cc2e4af16a0ae098cbffcb8472fb9e8ad6585b \
+    --hash=sha256:6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144
+    # via httpx
 certifi==2021.10.8 \
     --hash=sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872 \
     --hash=sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569
-    # via requests
+    # via
+    #   httpcore
+    #   httpx
 charset-normalizer==2.0.9 \
     --hash=sha256:1eecaa09422db5be9e29d7fc65664e6c33bd06f9ced7838578ba40d58bdf3721 \
     --hash=sha256:b0b883e8e874edfdece9c28f314e3dd5badf067342e42fb162203335ae61aa2c
-    # via requests
+    # via httpx
+contextvars==2.4 \
+    --hash=sha256:f38c908aaa59c14335eeea12abea5f443646216c4e29380d7bf34d2018e2c39e
+    # via
+    #   anyio
+    #   sniffio
+dataclasses==0.8 \
+    --hash=sha256:0201d89fa866f68c8ebd9d08ee6ff50c0b255f8ec63a71c16fda7af82bb887bf \
+    --hash=sha256:8479067f342acf957dc82ec415d355ab5edb7e7646b90dc6e2fd1d96ad084c97
+    # via anyio
+h11==0.12.0 \
+    --hash=sha256:36a3cb8c0a032f56e2da7084577878a035d3b61d104230d4bd49c0c6b555a9c6 \
+    --hash=sha256:47222cb6067e4a307d535814917cd98fd0a57b6788ce715755fa2b6c28b56042
+    # via httpcore
+httpcore==0.14.4 \
+    --hash=sha256:9410fe352bea732311f2b2bee0555c8cc5e62b9a73b9d3272fe125a2aa6eb28e \
+    --hash=sha256:d4305811f604d3c2e22869147392f134796976ff946c96a8cfba87f4e0171d83
+    # via httpx
+httpx==0.21.3 \
+    --hash=sha256:7a3eb67ef0b8abbd6d9402248ef2f84a76080fa1c839f8662e6eb385640e445a \
+    --hash=sha256:df9a0fd43fa79dbab411d83eb1ea6f7a525c96ad92e60c2d7f40388971b25777
+    # via -r requirements.in
 idna==3.3 \
     --hash=sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff \
     --hash=sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d
-    # via requests
+    # via
+    #   anyio
+    #   rfc3986
+immutables==0.16 \
+    --hash=sha256:0020aaa4010b136056c20a46ce53204e1407a9e4464246cb2cf95b90808d9161 \
+    --hash=sha256:064001638ab5d36f6aa05b6101446f4a5793fb71e522bc81b8fc65a1894266ff \
+    --hash=sha256:0a396314b9024fa55bf83a27813fd76cf9f27dce51f53b0f19b51de035146251 \
+    --hash=sha256:19bdede174847c2ef1292df0f23868ab3918b560febb09fcac6eec621bd4812b \
+    --hash=sha256:1de393f1b188740ca7b38f946f2bbc7edf3910d2048f03bbb8d01f17a038d67c \
+    --hash=sha256:2505d93395d3f8ae4223e21465994c3bc6952015a38dc4f03cb3e07a2b8d8325 \
+    --hash=sha256:298a301f85f307b4c056a0825eb30f060e64d73605e783289f3df37dd762bab8 \
+    --hash=sha256:29c9ed003eacb92e630ef200e31f47236c2139b39476894f7963b32bd39bafa3 \
+    --hash=sha256:4a2a71678348fb95b13ca108d447f559a754c41b47bd1e7e4fb23974e735682d \
+    --hash=sha256:50793a44ba0d228ed8cad4d0925e00dfd62ea32f44ddee8854f8066447272d05 \
+    --hash=sha256:511c93d8b1bbbf103ff3f1f120c5a68a9866ce03dea6ac406537f93ca9b19139 \
+    --hash=sha256:734c269e82e5f307fb6e17945953b67659d1731e65309787b8f7ba267d1468f2 \
+    --hash=sha256:798b095381eb42cf40db6876339e7bed84093e5868018a9e73d8e1f7ab4bb21e \
+    --hash=sha256:799621dcdcdcbb2516546a40123b87bf88de75fe7459f7bd8144f079ace6ec3e \
+    --hash=sha256:7a58825ff2254e2612c5a932174398a4ea8fbddd8a64a02c880cc32ee28b8820 \
+    --hash=sha256:7bcf52aeb983bd803b7c6106eae1b2d9a0c7ab1241bc6b45e2174ba2b7283031 \
+    --hash=sha256:9ccf4c0e3e2e3237012b516c74c49de8872ccdf9129739f7a0b9d7444a8c4862 \
+    --hash=sha256:a307eb0984eb43e815dcacea3ac50c11d00a936ecf694c46991cd5a23bcb0ec0 \
+    --hash=sha256:a454d5d3fee4b7cc627345791eb2ca4b27fa3bbb062ccf362ecaaa51679a07ed \
+    --hash=sha256:aa7bf572ae1e006104c584be70dc634849cf0dc62f42f4ee194774f97e7fd17d \
+    --hash=sha256:acbfa79d44228d96296279068441f980dc63dbed52522d9227ff9f4d96c6627e \
+    --hash=sha256:b651b61c1af6cda2ee201450f2ffe048a5959bc88e43e6c312f4c93e69c9e929 \
+    --hash=sha256:b779617f5b94486bfd0f22162cd72eb5f2beb0214a14b75fdafb7b2c908ed0cb \
+    --hash=sha256:d59beef203a3765db72b1d0943547425c8318ecf7d64c451fd1e130b653c2fbb \
+    --hash=sha256:d67e86859598eed0d926562da33325dac7767b7b1eff84e232c22abea19f4360 \
+    --hash=sha256:edd9f67671555af1eb99ad3c7550238487dd7ac0ac5205b40204ed61c9a922ac \
+    --hash=sha256:fcf678a3074613119385a02a07c469ec5130559f5ea843c85a0840c80b5b71c6
+    # via contextvars
 isort==5.10.0 \
     --hash=sha256:1a18ccace2ed8910bd9458b74a3ecbafd7b2f581301b0ab65cfdd4338272d76f \
     --hash=sha256:e52ff6d38012b131628cf0f26c51e7bd3a7c81592eefe3ac71411e692f1b9345
     # via -r requirements.in
-requests==2.27.1 \
-    --hash=sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61 \
-    --hash=sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d
-    # via -r requirements.in
-urllib3==1.26.7 \
-    --hash=sha256:4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece \
-    --hash=sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844
-    # via requests
+rfc3986[idna2008]==1.5.0 \
+    --hash=sha256:270aaf10d87d0d4e095063c65bf3ddbc6ee3d0b226328ce21e036f946e421835 \
+    --hash=sha256:a86d6e1f5b1dc238b218b012df0aa79409667bb209e58da56d0b94704e712a97
+    # via httpx
+sniffio==1.2.0 \
+    --hash=sha256:471b71698eac1c2112a40ce2752bb2f4a4814c22a54a3eed3676bc0f5ca9f663 \
+    --hash=sha256:c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de
+    # via
+    #   anyio
+    #   httpcore
+    #   httpx
+typing-extensions==4.0.1 \
+    --hash=sha256:4ca091dea149f945ec56afb48dae714f21e8692ef22a395223bcd328961b6a0e \
+    --hash=sha256:7f001e5ac290a0c0401508864c7ec868be4e701886d5b573a9528ed3973d9d3b
+    # via
+    #   anyio
+    #   immutables

From 7cd6b9948f64d2997e5285176e87f7515d9386ca Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Mon, 10 Jan 2022 14:04:45 -0800
Subject: [PATCH 33/87] Skip tests on Python 2.7

---
 pythonFiles/tests/unittestadapter/test_discovery.py | 9 +++++++++
 pythonFiles/tests/unittestadapter/test_utils.py     | 6 ++++++
 2 files changed, 15 insertions(+)

diff --git a/pythonFiles/tests/unittestadapter/test_discovery.py b/pythonFiles/tests/unittestadapter/test_discovery.py
index e550edbacb1c..6f09a9640eea 100644
--- a/pythonFiles/tests/unittestadapter/test_discovery.py
+++ b/pythonFiles/tests/unittestadapter/test_discovery.py
@@ -1,6 +1,9 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
+import sys
+import pytest
+
 from pathlib import PurePath
 
 from unittestadapter.discovery import (
@@ -14,6 +17,12 @@
 from . import TEST_DATA_PATH, is_same_tree
 
 
+if sys.version_info < (3):
+    pytest.skip(
+        "Skip unittest test discovery tests on Python 2.7", allow_module_level=True
+    )
+
+
 def test_parse_port_option() -> None:
     """
     The parse_port function should parse and return the port passed as a command-line option.
diff --git a/pythonFiles/tests/unittestadapter/test_utils.py b/pythonFiles/tests/unittestadapter/test_utils.py
index 68be645da16f..9492e5c2df13 100644
--- a/pythonFiles/tests/unittestadapter/test_utils.py
+++ b/pythonFiles/tests/unittestadapter/test_utils.py
@@ -1,6 +1,9 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
+import sys
+import pytest
+
 import unittest
 from pathlib import PurePath
 
@@ -14,6 +17,9 @@
 
 from . import is_same_tree, TEST_DATA_PATH
 
+if sys.version_info < (3):
+    pytest.skip("Skip unittest test utils tests on Python 2.7", allow_module_level=True)
+
 
 def test_simple_test_cases() -> None:
     """

From 49dd69a1855acbe6a3e187f8f9b56cce1b884540 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Mon, 10 Jan 2022 14:06:46 -0800
Subject: [PATCH 34/87] Do not run test discovery for now

---
 src/client/testing/testController/controller.ts | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/client/testing/testController/controller.ts b/src/client/testing/testController/controller.ts
index e00022b38d70..a3cc037df378 100644
--- a/src/client/testing/testController/controller.ts
+++ b/src/client/testing/testController/controller.ts
@@ -149,17 +149,7 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
             if (settings.testing.pytestEnabled) {
                 await this.pytest.refreshTestData(this.testController, uri, this.refreshCancellation.token);
             } else if (settings.testing.unittestEnabled) {
-                const workspace = this.workspaceService.getWorkspaceFolder(uri);
-                console.warn(`workspace name: ${workspace?.name} - uri: ${uri.fsPath}`);
-                const testAdapter =
-                    this.testAdapters.get(uri) || (this.testAdapters.values().next().value as WorkspaceTestAdapter);
-                testAdapter.discoverTests(
-                    this.testController,
-                    this.refreshCancellation.token,
-                    this.testAdapters.size > 1,
-                    this.workspaceService.workspaceFile?.fsPath || Common.workspace(),
-                );
-                // await this.unittest.refreshTestData(this.testController, uri, this.refreshCancellation.token);
+                await this.unittest.refreshTestData(this.testController, uri, this.refreshCancellation.token);
             } else {
                 sendTelemetryEvent(EventName.UNITTEST_DISABLED);
                 // If we are here we may have to remove an existing node from the tree

From cce1d28e7bd44d363dbba75ac149d9623790e3d9 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Mon, 10 Jan 2022 14:07:05 -0800
Subject: [PATCH 35/87] Do not run test discovery for now

---
 src/client/testing/testController/controller.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/client/testing/testController/controller.ts b/src/client/testing/testController/controller.ts
index a3cc037df378..99f86d317cd5 100644
--- a/src/client/testing/testController/controller.ts
+++ b/src/client/testing/testController/controller.ts
@@ -21,7 +21,6 @@ import { IWorkspaceService } from '../../common/application/types';
 import { IPythonExecutionFactory } from '../../common/process/types';
 import { IConfigurationService, IDisposableRegistry, Resource } from '../../common/types';
 import { DelayedTrigger, IDelayedTrigger } from '../../common/utils/delayTrigger';
-import { Common } from '../../common/utils/localize';
 import { traceVerbose } from '../../logging';
 import { sendTelemetryEvent } from '../../telemetry';
 import { EventName } from '../../telemetry/constants';

From 1d717199705aba03b2a51ffa90a1a0734a3fe654 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Mon, 10 Jan 2022 14:08:50 -0800
Subject: [PATCH 36/87] Leave a comment

---
 src/client/testing/testController/controller.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/client/testing/testController/controller.ts b/src/client/testing/testController/controller.ts
index 99f86d317cd5..cd03d86d2e7e 100644
--- a/src/client/testing/testController/controller.ts
+++ b/src/client/testing/testController/controller.ts
@@ -148,6 +148,7 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
             if (settings.testing.pytestEnabled) {
                 await this.pytest.refreshTestData(this.testController, uri, this.refreshCancellation.token);
             } else if (settings.testing.unittestEnabled) {
+                // TODO: Use new test discovery mechanism
                 await this.unittest.refreshTestData(this.testController, uri, this.refreshCancellation.token);
             } else {
                 sendTelemetryEvent(EventName.UNITTEST_DISABLED);

From 58f0f3a54933ba105f9849fbda16351fda89e8b1 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Mon, 10 Jan 2022 14:14:33 -0800
Subject: [PATCH 37/87] Install dataclasses for Python < 3.7

---
 requirements.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements.in b/requirements.in
index 0638c10e3747..1e68aef6383f 100644
--- a/requirements.in
+++ b/requirements.in
@@ -5,6 +5,7 @@
 
 # Unittest test adapter
 httpx==0.21.3
+dataclasses==0.8;python_version<3.7
 
 # Sort Imports
 isort==5.10.0

From 2a249a2708e6347ab8bde5e9486c2f217c67ae60 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Mon, 10 Jan 2022 15:15:46 -0800
Subject: [PATCH 38/87] Fix < 3.7 marker for dataclasses

---
 requirements.in  | 2 +-
 requirements.txt | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/requirements.in b/requirements.in
index 1e68aef6383f..653405150e31 100644
--- a/requirements.in
+++ b/requirements.in
@@ -5,7 +5,7 @@
 
 # Unittest test adapter
 httpx==0.21.3
-dataclasses==0.8;python_version<3.7
+dataclasses==0.8;python_version<'3.7'
 
 # Sort Imports
 isort==5.10.0
diff --git a/requirements.txt b/requirements.txt
index e761f2a5612c..336539b0b8f2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -27,10 +27,12 @@ contextvars==2.4 \
     # via
     #   anyio
     #   sniffio
-dataclasses==0.8 \
+dataclasses==0.8 ; python_version < "3.7" \
     --hash=sha256:0201d89fa866f68c8ebd9d08ee6ff50c0b255f8ec63a71c16fda7af82bb887bf \
     --hash=sha256:8479067f342acf957dc82ec415d355ab5edb7e7646b90dc6e2fd1d96ad084c97
-    # via anyio
+    # via
+    #   -r requirements.in
+    #   anyio
 h11==0.12.0 \
     --hash=sha256:36a3cb8c0a032f56e2da7084577878a035d3b61d104230d4bd49c0c6b555a9c6 \
     --hash=sha256:47222cb6067e4a307d535814917cd98fd0a57b6788ce715755fa2b6c28b56042

From f49cb1bc2275c0de6f88d25d15bb94681617863c Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Mon, 10 Jan 2022 15:28:36 -0800
Subject: [PATCH 39/87] Fix type annotations

---
 .../unittestadapter/.data/discovery_empty.py  |  2 +-
 .../.data/discovery_error/file_one.py         |  2 +-
 .../tests/unittestadapter/test_discovery.py   |  2 +-
 .../tests/unittestadapter/test_utils.py       | 28 +++++++++----------
 pythonFiles/unittestadapter/discovery.py      | 10 +++----
 pythonFiles/unittestadapter/utils.py          | 10 ++++---
 6 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/pythonFiles/tests/unittestadapter/.data/discovery_empty.py b/pythonFiles/tests/unittestadapter/.data/discovery_empty.py
index c489845c437d..0a067c285d1b 100644
--- a/pythonFiles/tests/unittestadapter/.data/discovery_empty.py
+++ b/pythonFiles/tests/unittestadapter/.data/discovery_empty.py
@@ -11,5 +11,5 @@ class DiscoveryEmpty(unittest.TestCase):
     if unittest discovery was performed successfully but no tests were found.
     """
 
-    def something() -> None:
+    def something(self) -> bool:
         return True
diff --git a/pythonFiles/tests/unittestadapter/.data/discovery_error/file_one.py b/pythonFiles/tests/unittestadapter/.data/discovery_error/file_one.py
index d9a9a2754b85..2b23b9482097 100644
--- a/pythonFiles/tests/unittestadapter/.data/discovery_error/file_one.py
+++ b/pythonFiles/tests/unittestadapter/.data/discovery_error/file_one.py
@@ -3,7 +3,7 @@
 
 import unittest
 
-import something_else
+import something_else  # type: ignore
 
 
 class DiscoveryErrorOne(unittest.TestCase):
diff --git a/pythonFiles/tests/unittestadapter/test_discovery.py b/pythonFiles/tests/unittestadapter/test_discovery.py
index 6f09a9640eea..ab41113641b0 100644
--- a/pythonFiles/tests/unittestadapter/test_discovery.py
+++ b/pythonFiles/tests/unittestadapter/test_discovery.py
@@ -17,7 +17,7 @@
 from . import TEST_DATA_PATH, is_same_tree
 
 
-if sys.version_info < (3):
+if sys.version_info < (3, 0):
     pytest.skip(
         "Skip unittest test discovery tests on Python 2.7", allow_module_level=True
     )
diff --git a/pythonFiles/tests/unittestadapter/test_utils.py b/pythonFiles/tests/unittestadapter/test_utils.py
index 9492e5c2df13..1fd8a88cd3dc 100644
--- a/pythonFiles/tests/unittestadapter/test_utils.py
+++ b/pythonFiles/tests/unittestadapter/test_utils.py
@@ -17,7 +17,7 @@
 
 from . import is_same_tree, TEST_DATA_PATH
 
-if sys.version_info < (3):
+if sys.version_info < (3, 0):
     pytest.skip("Skip unittest test utils tests on Python 2.7", allow_module_level=True)
 
 
@@ -79,26 +79,26 @@ def test_get_existing_child_node() -> None:
     The get_child_node fuction should return the child node of a test tree if it exists.
     """
 
-    tree = {
+    tree: TestNode = {
         "name": "root",
         "path": "foo",
-        "type_": "folder",
+        "type_": TestNodeTypeEnum.folder,
         "children": [
             {
                 "name": "childOne",
                 "path": "child/one",
-                "type_": "folder",
+                "type_": TestNodeTypeEnum.folder,
                 "children": [
                     {
                         "name": "nestedOne",
                         "path": "nested/one",
-                        "type_": "folder",
+                        "type_": TestNodeTypeEnum.folder,
                         "children": [],
                     },
                     {
                         "name": "nestedTwo",
                         "path": "nested/two",
-                        "type_": "folder",
+                        "type_": TestNodeTypeEnum.folder,
                         "children": [],
                     },
                 ],
@@ -106,14 +106,14 @@ def test_get_existing_child_node() -> None:
             {
                 "name": "childTwo",
                 "path": "child/two",
-                "type_": "folder",
+                "type_": TestNodeTypeEnum.folder,
                 "children": [],
             },
         ],
     }
 
     initial_len = len(tree["children"])
-    result = get_child_node("childTwo", "child/two", "folder", tree)
+    result = get_child_node("childTwo", "child/two", TestNodeTypeEnum.folder, tree)
     post_len = len(tree["children"])
 
     assert result is not None
@@ -128,23 +128,23 @@ def test_no_existing_child_node() -> None:
     tree: TestNode = {
         "name": "root",
         "path": "foo",
-        "type_": "folder",
+        "type_": TestNodeTypeEnum.folder,
         "children": [
             {
                 "name": "childOne",
                 "path": "child/one",
-                "type_": "folder",
+                "type_": TestNodeTypeEnum.folder,
                 "children": [
                     {
                         "name": "nestedOne",
                         "path": "nested/one",
-                        "type_": "folder",
+                        "type_": TestNodeTypeEnum.folder,
                         "children": [],
                     },
                     {
                         "name": "nestedTwo",
                         "path": "nested/two",
-                        "type_": "folder",
+                        "type_": TestNodeTypeEnum.folder,
                         "children": [],
                     },
                 ],
@@ -152,14 +152,14 @@ def test_no_existing_child_node() -> None:
             {
                 "name": "childTwo",
                 "path": "child/two",
-                "type_": "folder",
+                "type_": TestNodeTypeEnum.folder,
                 "children": [],
             },
         ],
     }
 
     initial_len = len(tree["children"])
-    result = get_child_node("childThree", "child/three", "folder", tree)
+    result = get_child_node("childThree", "child/three", TestNodeTypeEnum.folder, tree)
     post_len = len(tree["children"])
     last_child = tree["children"][-1]
 
diff --git a/pythonFiles/unittestadapter/discovery.py b/pythonFiles/unittestadapter/discovery.py
index 62bc9889c3cd..2c986b6677b0 100644
--- a/pythonFiles/unittestadapter/discovery.py
+++ b/pythonFiles/unittestadapter/discovery.py
@@ -3,7 +3,7 @@
 
 import getopt
 import os
-from typing import Any, Dict, List, Tuple
+from typing import Any, Dict, List, Tuple, Union
 import sys
 import traceback
 import unittest
@@ -39,14 +39,14 @@ def parse_port(args: List[Arguments]) -> int:
     return port
 
 
-def parse_unittest_args(args: List[Arguments]) -> Tuple[str, str, str]:
+def parse_unittest_args(args: List[Arguments]) -> Tuple[str, str, Union[str, None]]:
     """
     Parse command-line arguments that should be forwarded to unittest.
     Unittest arguments are: -v, -s, -p, -t.
     """
-    pattern = "test*.py"
-    start_dir = "."
-    top_level_dir = None
+    pattern: str = "test*.py"
+    start_dir: str = "."
+    top_level_dir: Union[str, None] = None
 
     for opt in args:
         if opt[0] in ("-s", "--start-directory"):
diff --git a/pythonFiles/unittestadapter/utils.py b/pythonFiles/unittestadapter/utils.py
index 51187361ff21..99bd9b2f1162 100644
--- a/pythonFiles/unittestadapter/utils.py
+++ b/pythonFiles/unittestadapter/utils.py
@@ -4,7 +4,7 @@
 from enum import Enum
 import inspect
 import pathlib
-from typing import List, Tuple, TypedDict
+from typing import List, Tuple, TypedDict, Union
 import unittest
 
 # Types
@@ -92,7 +92,9 @@ def get_child_node(
         result = next(
             node
             for node in root["children"]
-            if node["name"] == name and node["type_"] == type_
+            if isinstance(node, TestNode)
+            and node["name"] == name
+            and node["type_"] == type_
         )
     except StopIteration:
         result = build_test_node(path, name, type_)
@@ -103,7 +105,7 @@ def get_child_node(
 
 def build_test_tree(
     suite: unittest.TestSuite, test_directory: str
-) -> Tuple[TestNode, List[str]]:
+) -> Tuple[Union[TestNode, None], List[str]]:
     """
     Build a test tree from a unittest test suite.
     This function returns the test tree, and any errors found by unittest.
@@ -148,7 +150,7 @@ def build_test_tree(
     for test_case in get_test_case(suite):
         test_id = test_case.id()
         if test_id.startswith("unittest.loader._FailedTest"):
-            errors.append(test_case._exception.__str__())
+            errors.append(test_case._exception.__str__())  # type: ignore
         else:
             # Get test path components
             folders = test_id.split(".")

From a11627241c284476c93803e0f6fff5e6e5a6a112 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Mon, 10 Jan 2022 15:53:25 -0800
Subject: [PATCH 40/87] Try other skip method

---
 .../tests/unittestadapter/test_discovery.py        | 14 ++++++++------
 pythonFiles/tests/unittestadapter/test_utils.py    |  9 ++++++---
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/pythonFiles/tests/unittestadapter/test_discovery.py b/pythonFiles/tests/unittestadapter/test_discovery.py
index ab41113641b0..7fecb5eb2f1f 100644
--- a/pythonFiles/tests/unittestadapter/test_discovery.py
+++ b/pythonFiles/tests/unittestadapter/test_discovery.py
@@ -17,12 +17,7 @@
 from . import TEST_DATA_PATH, is_same_tree
 
 
-if sys.version_info < (3, 0):
-    pytest.skip(
-        "Skip unittest test discovery tests on Python 2.7", allow_module_level=True
-    )
-
-
+@pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")
 def test_parse_port_option() -> None:
     """
     The parse_port function should parse and return the port passed as a command-line option.
@@ -35,6 +30,7 @@ def test_parse_port_option() -> None:
     assert expected == actual
 
 
+@pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")
 def test_parse_no_port_option() -> None:
     """
     The parse_port function should return a default port value if there was no --port command-line option.
@@ -46,6 +42,7 @@ def test_parse_no_port_option() -> None:
     assert DEFAULT_PORT == actual
 
 
+@pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")
 def test_parse_short_unittest_args() -> None:
     """
     The parse_unittest_args function should return the values for the start_dir, pattern, and top_level_dir arguments
@@ -67,6 +64,7 @@ def test_parse_short_unittest_args() -> None:
     assert expected_top_level_dir == actual_top_level_dir
 
 
+@pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")
 def test_parse_long_unittest_args() -> None:
     """
     The parse_unittest_args function should return the values for the start_dir, pattern, and top_level_dir arguments
@@ -88,6 +86,7 @@ def test_parse_long_unittest_args() -> None:
     assert expected_top_level_dir == actual_top_level_dir
 
 
+@pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")
 def test_parse_no_unittest_args() -> None:
     """
     The parse_unittest_args function should return default values for the start_dir, pattern, and top_level_dir arguments
@@ -107,6 +106,7 @@ def test_parse_no_unittest_args() -> None:
     assert expected_top_level_dir == actual_top_level_dir
 
 
+@pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")
 def test_simple_discovery() -> None:
     """
     The discover_tests function should return a dictionary with a "success" status, no errors, and a test tree
@@ -159,6 +159,7 @@ def test_simple_discovery() -> None:
     assert "errors" not in actual
 
 
+@pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")
 def test_empty_discovery() -> None:
     """
     The discover_tests function should return a dictionary with a "success" status, no errors, and no test tree
@@ -174,6 +175,7 @@ def test_empty_discovery() -> None:
     assert "errors" not in actual
 
 
+@pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")
 def test_error_discovery() -> None:
     """
     The discover_tests function should return a dictionary with an "error" status, the discovered tests, and a list of errors
diff --git a/pythonFiles/tests/unittestadapter/test_utils.py b/pythonFiles/tests/unittestadapter/test_utils.py
index 1fd8a88cd3dc..901a28f2461e 100644
--- a/pythonFiles/tests/unittestadapter/test_utils.py
+++ b/pythonFiles/tests/unittestadapter/test_utils.py
@@ -17,10 +17,8 @@
 
 from . import is_same_tree, TEST_DATA_PATH
 
-if sys.version_info < (3, 0):
-    pytest.skip("Skip unittest test utils tests on Python 2.7", allow_module_level=True)
-
 
+@pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")
 def test_simple_test_cases() -> None:
     """
     The get_test_case fuction should return tests from the test suite.
@@ -46,6 +44,7 @@ def test_simple_test_cases() -> None:
     assert expected == actual
 
 
+@pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")
 def test_nested_test_cases() -> None:
     """
     The get_test_case fuction should return tests from all test suites,
@@ -74,6 +73,7 @@ def test_nested_test_cases() -> None:
     assert expected == actual
 
 
+@pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")
 def test_get_existing_child_node() -> None:
     """
     The get_child_node fuction should return the child node of a test tree if it exists.
@@ -120,6 +120,7 @@ def test_get_existing_child_node() -> None:
     assert initial_len == post_len
 
 
+@pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")
 def test_no_existing_child_node() -> None:
     """
     The get_child_node fuction should add a child node to a test tree and return it if it does not exist.
@@ -168,6 +169,7 @@ def test_no_existing_child_node() -> None:
     assert initial_len < post_len
 
 
+@pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")
 def test_build_simple_tree() -> None:
     """
     The build_test_tree function should build and return a test tree from discovered test suites, and an empty list of errors if there are none in the discovered data.
@@ -222,6 +224,7 @@ def test_build_simple_tree() -> None:
     assert len(errors) == 0
 
 
+@pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")
 def test_build_empty_tree() -> None:
     """
     The build_test_tree function should return None if there are no discovered test suites, and an empty list of errors if there are none in the discovered data

From 5ed11788f6183330ced2e2ff21781163fdf7f162 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Mon, 10 Jan 2022 16:07:49 -0800
Subject: [PATCH 41/87] Try skipping tests in a different way

---
 pythonFiles/tests/unittestadapter/conftest.py | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 pythonFiles/tests/unittestadapter/conftest.py

diff --git a/pythonFiles/tests/unittestadapter/conftest.py b/pythonFiles/tests/unittestadapter/conftest.py
new file mode 100644
index 000000000000..193a55cd0566
--- /dev/null
+++ b/pythonFiles/tests/unittestadapter/conftest.py
@@ -0,0 +1,6 @@
+# content of conftest.py
+import sys
+
+# Ignore the contents of this folder for Python2 tests.
+if sys.version_info[0] < 3:
+    collect_ignore.append(".")

From eb0d6dd70a8963b046473a4c2a67bf800425b20b Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Mon, 10 Jan 2022 16:07:53 -0800
Subject: [PATCH 42/87] Fix tests

---
 pythonFiles/unittestadapter/utils.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pythonFiles/unittestadapter/utils.py b/pythonFiles/unittestadapter/utils.py
index 99bd9b2f1162..a737ba951ad0 100644
--- a/pythonFiles/unittestadapter/utils.py
+++ b/pythonFiles/unittestadapter/utils.py
@@ -92,15 +92,13 @@ def get_child_node(
         result = next(
             node
             for node in root["children"]
-            if isinstance(node, TestNode)
-            and node["name"] == name
-            and node["type_"] == type_
+            if node["name"] == name and node["type_"] == type_
         )
     except StopIteration:
         result = build_test_node(path, name, type_)
         root["children"].append(result)
 
-    return result
+    return result  # type:ignore
 
 
 def build_test_tree(

From dae0c16a1f853da0ae0c54b4ec4ba61f58685f4a Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Mon, 10 Jan 2022 16:16:58 -0800
Subject: [PATCH 43/87] Doesn't like stuff in __init__.py

---
 pythonFiles/tests/unittestadapter/__init__.py | 35 -------------------
 pythonFiles/tests/unittestadapter/helpers.py  | 34 ++++++++++++++++++
 .../tests/unittestadapter/test_discovery.py   |  3 +-
 .../tests/unittestadapter/test_utils.py       |  3 +-
 4 files changed, 38 insertions(+), 37 deletions(-)
 create mode 100644 pythonFiles/tests/unittestadapter/helpers.py

diff --git a/pythonFiles/tests/unittestadapter/__init__.py b/pythonFiles/tests/unittestadapter/__init__.py
index 3cc8b65cdee8..e313e3e36a75 100644
--- a/pythonFiles/tests/unittestadapter/__init__.py
+++ b/pythonFiles/tests/unittestadapter/__init__.py
@@ -4,38 +4,3 @@
 from pathlib import Path
 
 TEST_DATA_PATH = Path(Path(__file__).parent, ".data")
-
-# Helper function to test if two test trees are the same.
-def is_same_tree(tree1, tree2) -> bool:
-    """
-    Helper function to test if two test trees are the same by comparing the root attributes,
-    and checking if all children are the same.
-    """
-    # Compare the root
-    if (
-        tree1["path"] != tree2["path"]
-        or tree1["name"] != tree2["name"]
-        or tree1["type_"] != tree2["type_"]
-    ):
-        return False
-
-    # Compare child test nodes if they exist, otherwise compare test items.
-    if "children" in tree1 and "children" in tree2:
-        children1 = tree1["children"]
-        children2 = tree2["children"]
-
-        # Compare test nodes
-        if len(children1) != len(children2):
-            return False
-        else:
-            result = True
-            index = 0
-            while index < len(children1) and result == True:
-                result = result and is_same_tree(children1[index], children2[index])
-                index = index + 1
-            return result
-    elif "id_" in tree1 and "id_" in tree2:
-        # Compare test items
-        return tree1["id_"] == tree2["id_"] and tree1["lineno"] == tree2["lineno"]
-
-    return False
diff --git a/pythonFiles/tests/unittestadapter/helpers.py b/pythonFiles/tests/unittestadapter/helpers.py
new file mode 100644
index 000000000000..ff973656112e
--- /dev/null
+++ b/pythonFiles/tests/unittestadapter/helpers.py
@@ -0,0 +1,34 @@
+# Helper function to test if two test trees are the same.
+def is_same_tree(tree1, tree2) -> bool:
+    """
+    Helper function to test if two test trees are the same by comparing the root attributes,
+    and checking if all children are the same.
+    """
+    # Compare the root
+    if (
+        tree1["path"] != tree2["path"]
+        or tree1["name"] != tree2["name"]
+        or tree1["type_"] != tree2["type_"]
+    ):
+        return False
+
+    # Compare child test nodes if they exist, otherwise compare test items.
+    if "children" in tree1 and "children" in tree2:
+        children1 = tree1["children"]
+        children2 = tree2["children"]
+
+        # Compare test nodes
+        if len(children1) != len(children2):
+            return False
+        else:
+            result = True
+            index = 0
+            while index < len(children1) and result == True:
+                result = result and is_same_tree(children1[index], children2[index])
+                index = index + 1
+            return result
+    elif "id_" in tree1 and "id_" in tree2:
+        # Compare test items
+        return tree1["id_"] == tree2["id_"] and tree1["lineno"] == tree2["lineno"]
+
+    return False
diff --git a/pythonFiles/tests/unittestadapter/test_discovery.py b/pythonFiles/tests/unittestadapter/test_discovery.py
index 7fecb5eb2f1f..a61293310341 100644
--- a/pythonFiles/tests/unittestadapter/test_discovery.py
+++ b/pythonFiles/tests/unittestadapter/test_discovery.py
@@ -14,7 +14,8 @@
 )
 from unittestadapter.utils import TestNodeTypeEnum
 
-from . import TEST_DATA_PATH, is_same_tree
+from . import TEST_DATA_PATH
+from .helpers import is_same_tree
 
 
 @pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")
diff --git a/pythonFiles/tests/unittestadapter/test_utils.py b/pythonFiles/tests/unittestadapter/test_utils.py
index 901a28f2461e..7577c1a83cb4 100644
--- a/pythonFiles/tests/unittestadapter/test_utils.py
+++ b/pythonFiles/tests/unittestadapter/test_utils.py
@@ -15,7 +15,8 @@
     TestNodeTypeEnum,
 )
 
-from . import is_same_tree, TEST_DATA_PATH
+from . import TEST_DATA_PATH
+from .helpers import is_same_tree
 
 
 @pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")

From bc21e0c20287e65cd2b59dbc4cc924b846c6502d Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Mon, 10 Jan 2022 16:20:03 -0800
Subject: [PATCH 44/87] Forgot that pathlib was also a no-go

---
 pythonFiles/tests/unittestadapter/__init__.py       | 4 ----
 pythonFiles/tests/unittestadapter/helpers.py        | 7 +++++++
 pythonFiles/tests/unittestadapter/test_discovery.py | 3 +--
 pythonFiles/tests/unittestadapter/test_utils.py     | 3 +--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pythonFiles/tests/unittestadapter/__init__.py b/pythonFiles/tests/unittestadapter/__init__.py
index e313e3e36a75..5b7f7a925cc0 100644
--- a/pythonFiles/tests/unittestadapter/__init__.py
+++ b/pythonFiles/tests/unittestadapter/__init__.py
@@ -1,6 +1,2 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
-
-from pathlib import Path
-
-TEST_DATA_PATH = Path(Path(__file__).parent, ".data")
diff --git a/pythonFiles/tests/unittestadapter/helpers.py b/pythonFiles/tests/unittestadapter/helpers.py
index ff973656112e..3cc8b65cdee8 100644
--- a/pythonFiles/tests/unittestadapter/helpers.py
+++ b/pythonFiles/tests/unittestadapter/helpers.py
@@ -1,3 +1,10 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+from pathlib import Path
+
+TEST_DATA_PATH = Path(Path(__file__).parent, ".data")
+
 # Helper function to test if two test trees are the same.
 def is_same_tree(tree1, tree2) -> bool:
     """
diff --git a/pythonFiles/tests/unittestadapter/test_discovery.py b/pythonFiles/tests/unittestadapter/test_discovery.py
index a61293310341..d22882c0df27 100644
--- a/pythonFiles/tests/unittestadapter/test_discovery.py
+++ b/pythonFiles/tests/unittestadapter/test_discovery.py
@@ -14,8 +14,7 @@
 )
 from unittestadapter.utils import TestNodeTypeEnum
 
-from . import TEST_DATA_PATH
-from .helpers import is_same_tree
+from .helpers import TEST_DATA_PATH, is_same_tree
 
 
 @pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")
diff --git a/pythonFiles/tests/unittestadapter/test_utils.py b/pythonFiles/tests/unittestadapter/test_utils.py
index 7577c1a83cb4..48005bcbab9d 100644
--- a/pythonFiles/tests/unittestadapter/test_utils.py
+++ b/pythonFiles/tests/unittestadapter/test_utils.py
@@ -15,8 +15,7 @@
     TestNodeTypeEnum,
 )
 
-from . import TEST_DATA_PATH
-from .helpers import is_same_tree
+from .helpers import TEST_DATA_PATH, is_same_tree
 
 
 @pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")

From 3d7c2bb8b7aebc25fbd91b327733aabc8a1acae9 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Mon, 10 Jan 2022 16:33:16 -0800
Subject: [PATCH 45/87] I don't know how Python works

---
 pythonFiles/tests/unittestadapter/conftest.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pythonFiles/tests/unittestadapter/conftest.py b/pythonFiles/tests/unittestadapter/conftest.py
index 193a55cd0566..81374f46b21a 100644
--- a/pythonFiles/tests/unittestadapter/conftest.py
+++ b/pythonFiles/tests/unittestadapter/conftest.py
@@ -1,6 +1,9 @@
-# content of conftest.py
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 import sys
 
 # Ignore the contents of this folder for Python2 tests.
+collect_ignore = []
 if sys.version_info[0] < 3:
     collect_ignore.append(".")

From 366ffe9a6b100066ac1f128f77279029a1aec1c7 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Mon, 10 Jan 2022 16:38:13 -0800
Subject: [PATCH 46/87] Use wildcard instead

---
 pythonFiles/tests/unittestadapter/conftest.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pythonFiles/tests/unittestadapter/conftest.py b/pythonFiles/tests/unittestadapter/conftest.py
index 81374f46b21a..700b5b83095a 100644
--- a/pythonFiles/tests/unittestadapter/conftest.py
+++ b/pythonFiles/tests/unittestadapter/conftest.py
@@ -4,6 +4,5 @@
 import sys
 
 # Ignore the contents of this folder for Python2 tests.
-collect_ignore = []
 if sys.version_info[0] < 3:
-    collect_ignore.append(".")
+    collect_ignore_glob = ["*.py"]

From 0667fd4310252e6debfe285b6003447c530978ab Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Tue, 11 Jan 2022 13:40:48 -0800
Subject: [PATCH 47/87] Re-generate requirements using python 3.7

---
 requirements.in  |  1 -
 requirements.txt | 50 ++----------------------------------------------
 2 files changed, 2 insertions(+), 49 deletions(-)

diff --git a/requirements.in b/requirements.in
index 653405150e31..0638c10e3747 100644
--- a/requirements.in
+++ b/requirements.in
@@ -5,7 +5,6 @@
 
 # Unittest test adapter
 httpx==0.21.3
-dataclasses==0.8;python_version<'3.7'
 
 # Sort Imports
 isort==5.10.0
diff --git a/requirements.txt b/requirements.txt
index 336539b0b8f2..d33b74f5010c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with python 3.6
+# This file is autogenerated by pip-compile with python 3.7
 # To update, run:
 #
 #    pip-compile --generate-hashes requirements.in
@@ -8,10 +8,6 @@ anyio==3.4.0 \
     --hash=sha256:24adc69309fb5779bc1e06158e143e0b6d2c56b302a3ac3de3083c705a6ed39d \
     --hash=sha256:2855a9423524abcdd652d942f8932fda1735210f77a6b392eafd9ff34d3fe020
     # via httpcore
-async-generator==1.10 \
-    --hash=sha256:01c7bf666359b4967d2cda0000cc2e4af16a0ae098cbffcb8472fb9e8ad6585b \
-    --hash=sha256:6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144
-    # via httpx
 certifi==2021.10.8 \
     --hash=sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872 \
     --hash=sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569
@@ -22,17 +18,6 @@ charset-normalizer==2.0.9 \
     --hash=sha256:1eecaa09422db5be9e29d7fc65664e6c33bd06f9ced7838578ba40d58bdf3721 \
     --hash=sha256:b0b883e8e874edfdece9c28f314e3dd5badf067342e42fb162203335ae61aa2c
     # via httpx
-contextvars==2.4 \
-    --hash=sha256:f38c908aaa59c14335eeea12abea5f443646216c4e29380d7bf34d2018e2c39e
-    # via
-    #   anyio
-    #   sniffio
-dataclasses==0.8 ; python_version < "3.7" \
-    --hash=sha256:0201d89fa866f68c8ebd9d08ee6ff50c0b255f8ec63a71c16fda7af82bb887bf \
-    --hash=sha256:8479067f342acf957dc82ec415d355ab5edb7e7646b90dc6e2fd1d96ad084c97
-    # via
-    #   -r requirements.in
-    #   anyio
 h11==0.12.0 \
     --hash=sha256:36a3cb8c0a032f56e2da7084577878a035d3b61d104230d4bd49c0c6b555a9c6 \
     --hash=sha256:47222cb6067e4a307d535814917cd98fd0a57b6788ce715755fa2b6c28b56042
@@ -51,35 +36,6 @@ idna==3.3 \
     # via
     #   anyio
     #   rfc3986
-immutables==0.16 \
-    --hash=sha256:0020aaa4010b136056c20a46ce53204e1407a9e4464246cb2cf95b90808d9161 \
-    --hash=sha256:064001638ab5d36f6aa05b6101446f4a5793fb71e522bc81b8fc65a1894266ff \
-    --hash=sha256:0a396314b9024fa55bf83a27813fd76cf9f27dce51f53b0f19b51de035146251 \
-    --hash=sha256:19bdede174847c2ef1292df0f23868ab3918b560febb09fcac6eec621bd4812b \
-    --hash=sha256:1de393f1b188740ca7b38f946f2bbc7edf3910d2048f03bbb8d01f17a038d67c \
-    --hash=sha256:2505d93395d3f8ae4223e21465994c3bc6952015a38dc4f03cb3e07a2b8d8325 \
-    --hash=sha256:298a301f85f307b4c056a0825eb30f060e64d73605e783289f3df37dd762bab8 \
-    --hash=sha256:29c9ed003eacb92e630ef200e31f47236c2139b39476894f7963b32bd39bafa3 \
-    --hash=sha256:4a2a71678348fb95b13ca108d447f559a754c41b47bd1e7e4fb23974e735682d \
-    --hash=sha256:50793a44ba0d228ed8cad4d0925e00dfd62ea32f44ddee8854f8066447272d05 \
-    --hash=sha256:511c93d8b1bbbf103ff3f1f120c5a68a9866ce03dea6ac406537f93ca9b19139 \
-    --hash=sha256:734c269e82e5f307fb6e17945953b67659d1731e65309787b8f7ba267d1468f2 \
-    --hash=sha256:798b095381eb42cf40db6876339e7bed84093e5868018a9e73d8e1f7ab4bb21e \
-    --hash=sha256:799621dcdcdcbb2516546a40123b87bf88de75fe7459f7bd8144f079ace6ec3e \
-    --hash=sha256:7a58825ff2254e2612c5a932174398a4ea8fbddd8a64a02c880cc32ee28b8820 \
-    --hash=sha256:7bcf52aeb983bd803b7c6106eae1b2d9a0c7ab1241bc6b45e2174ba2b7283031 \
-    --hash=sha256:9ccf4c0e3e2e3237012b516c74c49de8872ccdf9129739f7a0b9d7444a8c4862 \
-    --hash=sha256:a307eb0984eb43e815dcacea3ac50c11d00a936ecf694c46991cd5a23bcb0ec0 \
-    --hash=sha256:a454d5d3fee4b7cc627345791eb2ca4b27fa3bbb062ccf362ecaaa51679a07ed \
-    --hash=sha256:aa7bf572ae1e006104c584be70dc634849cf0dc62f42f4ee194774f97e7fd17d \
-    --hash=sha256:acbfa79d44228d96296279068441f980dc63dbed52522d9227ff9f4d96c6627e \
-    --hash=sha256:b651b61c1af6cda2ee201450f2ffe048a5959bc88e43e6c312f4c93e69c9e929 \
-    --hash=sha256:b779617f5b94486bfd0f22162cd72eb5f2beb0214a14b75fdafb7b2c908ed0cb \
-    --hash=sha256:d59beef203a3765db72b1d0943547425c8318ecf7d64c451fd1e130b653c2fbb \
-    --hash=sha256:d67e86859598eed0d926562da33325dac7767b7b1eff84e232c22abea19f4360 \
-    --hash=sha256:edd9f67671555af1eb99ad3c7550238487dd7ac0ac5205b40204ed61c9a922ac \
-    --hash=sha256:fcf678a3074613119385a02a07c469ec5130559f5ea843c85a0840c80b5b71c6
-    # via contextvars
 isort==5.10.0 \
     --hash=sha256:1a18ccace2ed8910bd9458b74a3ecbafd7b2f581301b0ab65cfdd4338272d76f \
     --hash=sha256:e52ff6d38012b131628cf0f26c51e7bd3a7c81592eefe3ac71411e692f1b9345
@@ -98,6 +54,4 @@ sniffio==1.2.0 \
 typing-extensions==4.0.1 \
     --hash=sha256:4ca091dea149f945ec56afb48dae714f21e8692ef22a395223bcd328961b6a0e \
     --hash=sha256:7f001e5ac290a0c0401508864c7ec868be4e701886d5b573a9528ed3973d9d3b
-    # via
-    #   anyio
-    #   immutables
+    # via anyio

From abcae07ba5c5466c2a31a4a651a9df20b0690d1c Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <51720070+kimadeline@users.noreply.github.com>
Date: Thu, 13 Jan 2022 14:54:27 -0800
Subject: [PATCH 48/87] Apply suggestions from code review

Co-authored-by: Brett Cannon <brett@python.org>
---
 pythonFiles/tests/unittestadapter/helpers.py    | 15 +++------------
 pythonFiles/tests/unittestadapter/test_utils.py |  4 ++--
 pythonFiles/unittestadapter/discovery.py        |  4 ++--
 pythonFiles/unittestadapter/utils.py            |  8 +++-----
 requirements.in                                 |  1 -
 5 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/pythonFiles/tests/unittestadapter/helpers.py b/pythonFiles/tests/unittestadapter/helpers.py
index 3cc8b65cdee8..5074f2d9d9e7 100644
--- a/pythonFiles/tests/unittestadapter/helpers.py
+++ b/pythonFiles/tests/unittestadapter/helpers.py
@@ -12,11 +12,7 @@ def is_same_tree(tree1, tree2) -> bool:
     and checking if all children are the same.
     """
     # Compare the root
-    if (
-        tree1["path"] != tree2["path"]
-        or tree1["name"] != tree2["name"]
-        or tree1["type_"] != tree2["type_"]
-    ):
+    if any(tree1[key] != tree2[key] for key in ["path", "name", "type_"]):
         return False
 
     # Compare child test nodes if they exist, otherwise compare test items.
@@ -28,14 +24,9 @@ def is_same_tree(tree1, tree2) -> bool:
         if len(children1) != len(children2):
             return False
         else:
-            result = True
-            index = 0
-            while index < len(children1) and result == True:
-                result = result and is_same_tree(children1[index], children2[index])
-                index = index + 1
-            return result
+            return all(is_same_tree(*pair) for pair in zip(children1, children2))
     elif "id_" in tree1 and "id_" in tree2:
         # Compare test items
-        return tree1["id_"] == tree2["id_"] and tree1["lineno"] == tree2["lineno"]
+        return any(tree1[key] != tree2[key] for key in ["id_", "lineno"])
 
     return False
diff --git a/pythonFiles/tests/unittestadapter/test_utils.py b/pythonFiles/tests/unittestadapter/test_utils.py
index 48005bcbab9d..4015e316194e 100644
--- a/pythonFiles/tests/unittestadapter/test_utils.py
+++ b/pythonFiles/tests/unittestadapter/test_utils.py
@@ -221,7 +221,7 @@ def test_build_simple_tree() -> None:
     tests, errors = build_test_tree(suite, start_dir)
 
     assert is_same_tree(expected, tests)
-    assert len(errors) == 0
+    assert not errors
 
 
 @pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")
@@ -241,4 +241,4 @@ def test_build_empty_tree() -> None:
 
     # Build tree
     assert expected == tests
-    assert len(errors) == 0
+    assert not errors
diff --git a/pythonFiles/unittestadapter/discovery.py b/pythonFiles/unittestadapter/discovery.py
index 2c986b6677b0..4f79c45558e0 100644
--- a/pythonFiles/unittestadapter/discovery.py
+++ b/pythonFiles/unittestadapter/discovery.py
@@ -77,7 +77,7 @@ def discover_tests(start_dir, pattern, top_level_dir) -> Dict[str, Any]:
         suite = loader.discover(start_dir, pattern, top_level_dir)
 
         tests, errors = build_test_tree(suite, cwd)
-    except:
+    except Exception:
         errors.append(traceback.format_exc())
 
     if tests is not None:
@@ -126,7 +126,7 @@ def discover_tests(start_dir, pattern, top_level_dir) -> Dict[str, Any]:
 
     start_dir, pattern, top_level_dir = parse_unittest_args(unittest_args)
 
-    # Perform test discovery & send it over
+    # Perform test discovery & send it over.
     payload = discover_tests(start_dir, pattern, top_level_dir)
 
     port = parse_port(script_args)
diff --git a/pythonFiles/unittestadapter/utils.py b/pythonFiles/unittestadapter/utils.py
index a737ba951ad0..3c16de392a82 100644
--- a/pythonFiles/unittestadapter/utils.py
+++ b/pythonFiles/unittestadapter/utils.py
@@ -152,14 +152,12 @@ def build_test_tree(
         else:
             # Get test path components
             folders = test_id.split(".")
-            function_name = folders.pop()
-            class_name = folders.pop()
-            filename = folders.pop()
+            function_name, class_name, filename = folders[:3]
             py_filename = f"{filename}.py"
 
             current_node = root
 
-            # Find/build folder nodes
+            # Find/build folder nodes.
             for folder in folders:
                 current_node = get_child_node(
                     folder,
@@ -194,7 +192,7 @@ def build_test_tree(
             }
             current_node["children"].append(test_node)
 
-    if len(root["children"]) == 0:
+    if not root["children"]:
         root = None
 
     return root, errors
diff --git a/requirements.in b/requirements.in
index 653405150e31..0638c10e3747 100644
--- a/requirements.in
+++ b/requirements.in
@@ -5,7 +5,6 @@
 
 # Unittest test adapter
 httpx==0.21.3
-dataclasses==0.8;python_version<'3.7'
 
 # Sort Imports
 isort==5.10.0

From 7ee315af15d8104f2e0d3b4a8ec44c48fb7b363f Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Thu, 13 Jan 2022 16:22:00 -0800
Subject: [PATCH 49/87] First batch of fixes

- Fix comments (end with a period, move first line of a multiline comment)
- Remove unnecessary pytest decorators
---
 .../unittestadapter/.data/discovery_empty.py  |  4 +-
 .../.data/discovery_error/file_one.py         |  4 +-
 .../.data/discovery_error/file_two.py         |  4 +-
 .../unittestadapter/.data/discovery_simple.py |  4 +-
 .../.data/utils_nested_cases/file_one.py      |  4 +-
 .../utils_nested_cases/folder/file_two.py     |  4 +-
 .../.data/utils_simple_cases.py               |  4 +-
 .../.data/utils_simple_tree.py                |  4 +-
 pythonFiles/tests/unittestadapter/conftest.py |  2 +-
 pythonFiles/tests/unittestadapter/helpers.py  | 14 ++--
 .../tests/unittestadapter/test_discovery.py   | 36 +++-------
 .../tests/unittestadapter/test_utils.py       | 42 ++++--------
 pythonFiles/unittestadapter/discovery.py      | 65 +++++++++----------
 pythonFiles/unittestadapter/utils.py          | 33 ++++------
 14 files changed, 88 insertions(+), 136 deletions(-)

diff --git a/pythonFiles/tests/unittestadapter/.data/discovery_empty.py b/pythonFiles/tests/unittestadapter/.data/discovery_empty.py
index 0a067c285d1b..9af5071303ce 100644
--- a/pythonFiles/tests/unittestadapter/.data/discovery_empty.py
+++ b/pythonFiles/tests/unittestadapter/.data/discovery_empty.py
@@ -5,8 +5,8 @@
 
 
 class DiscoveryEmpty(unittest.TestCase):
-    """
-    Test class for the test_empty_discovery test.
+    """Test class for the test_empty_discovery test.
+
     The discover_tests function should return a dictionary with a "success" status, no errors, and no test tree
     if unittest discovery was performed successfully but no tests were found.
     """
diff --git a/pythonFiles/tests/unittestadapter/.data/discovery_error/file_one.py b/pythonFiles/tests/unittestadapter/.data/discovery_error/file_one.py
index 2b23b9482097..42f84f046760 100644
--- a/pythonFiles/tests/unittestadapter/.data/discovery_error/file_one.py
+++ b/pythonFiles/tests/unittestadapter/.data/discovery_error/file_one.py
@@ -7,8 +7,8 @@
 
 
 class DiscoveryErrorOne(unittest.TestCase):
-    """
-    Test class for the test_error_discovery test.
+    """Test class for the test_error_discovery test.
+
     The discover_tests function should return a dictionary with an "error" status, the discovered tests, and a list of errors
     if unittest discovery failed at some point.
     """
diff --git a/pythonFiles/tests/unittestadapter/.data/discovery_error/file_two.py b/pythonFiles/tests/unittestadapter/.data/discovery_error/file_two.py
index babca2206af5..5d6d54f886a1 100644
--- a/pythonFiles/tests/unittestadapter/.data/discovery_error/file_two.py
+++ b/pythonFiles/tests/unittestadapter/.data/discovery_error/file_two.py
@@ -5,8 +5,8 @@
 
 
 class DiscoveryErrorTwo(unittest.TestCase):
-    """
-    Test class for the test_error_discovery test.
+    """Test class for the test_error_discovery test.
+
     The discover_tests function should return a dictionary with an "error" status, the discovered tests, and a list of errors
     if unittest discovery failed at some point.
     """
diff --git a/pythonFiles/tests/unittestadapter/.data/discovery_simple.py b/pythonFiles/tests/unittestadapter/.data/discovery_simple.py
index 53ceb79c3deb..1859436d5b5b 100644
--- a/pythonFiles/tests/unittestadapter/.data/discovery_simple.py
+++ b/pythonFiles/tests/unittestadapter/.data/discovery_simple.py
@@ -5,8 +5,8 @@
 
 
 class DiscoverySimple(unittest.TestCase):
-    """
-    Test class for the test_simple_discovery test.
+    """Test class for the test_simple_discovery test.
+
     The discover_tests function should return a dictionary with a "success" status, no errors, and a test tree
     if unittest discovery was performed successfully.
     """
diff --git a/pythonFiles/tests/unittestadapter/.data/utils_nested_cases/file_one.py b/pythonFiles/tests/unittestadapter/.data/utils_nested_cases/file_one.py
index e5ca901f31b5..84f7fefc4ebd 100644
--- a/pythonFiles/tests/unittestadapter/.data/utils_nested_cases/file_one.py
+++ b/pythonFiles/tests/unittestadapter/.data/utils_nested_cases/file_one.py
@@ -5,8 +5,8 @@
 
 
 class CaseTwoFileOne(unittest.TestCase):
-    """
-    Test class for the test_nested_test_cases test.
+    """Test class for the test_nested_test_cases test.
+
     get_test_case should return tests from the test suites in this folder.
     """
 
diff --git a/pythonFiles/tests/unittestadapter/.data/utils_nested_cases/folder/file_two.py b/pythonFiles/tests/unittestadapter/.data/utils_nested_cases/folder/file_two.py
index 8fa869e81434..235a104016a3 100644
--- a/pythonFiles/tests/unittestadapter/.data/utils_nested_cases/folder/file_two.py
+++ b/pythonFiles/tests/unittestadapter/.data/utils_nested_cases/folder/file_two.py
@@ -5,8 +5,8 @@
 
 
 class CaseTwoFileTwo(unittest.TestCase):
-    """
-    Test class for the test_nested_test_cases test.
+    """Test class for the test_nested_test_cases test.
+
     get_test_case should return tests from the test suites in this folder.
     """
 
diff --git a/pythonFiles/tests/unittestadapter/.data/utils_simple_cases.py b/pythonFiles/tests/unittestadapter/.data/utils_simple_cases.py
index aa3a40d9686a..fb3ae7eb7909 100644
--- a/pythonFiles/tests/unittestadapter/.data/utils_simple_cases.py
+++ b/pythonFiles/tests/unittestadapter/.data/utils_simple_cases.py
@@ -5,8 +5,8 @@
 
 
 class CaseOne(unittest.TestCase):
-    """
-    Test class for the test_simple_test_cases test.
+    """Test class for the test_simple_test_cases test.
+
     get_test_case should return tests from the test suite.
     """
 
diff --git a/pythonFiles/tests/unittestadapter/.data/utils_simple_tree.py b/pythonFiles/tests/unittestadapter/.data/utils_simple_tree.py
index 85848b87baac..6db51a4fd80b 100644
--- a/pythonFiles/tests/unittestadapter/.data/utils_simple_tree.py
+++ b/pythonFiles/tests/unittestadapter/.data/utils_simple_tree.py
@@ -5,8 +5,8 @@
 
 
 class TreeOne(unittest.TestCase):
-    """
-    Test class for the test_build_simple_tree test.
+    """Test class for the test_build_simple_tree test.
+
     build_test_tree should build a test tree with these test cases.
     """
 
diff --git a/pythonFiles/tests/unittestadapter/conftest.py b/pythonFiles/tests/unittestadapter/conftest.py
index 700b5b83095a..19af85d1e095 100644
--- a/pythonFiles/tests/unittestadapter/conftest.py
+++ b/pythonFiles/tests/unittestadapter/conftest.py
@@ -3,6 +3,6 @@
 
 import sys
 
-# Ignore the contents of this folder for Python2 tests.
+# Ignore the contents of this folder for Python 2 tests.
 if sys.version_info[0] < 3:
     collect_ignore_glob = ["*.py"]
diff --git a/pythonFiles/tests/unittestadapter/helpers.py b/pythonFiles/tests/unittestadapter/helpers.py
index 5074f2d9d9e7..93c9845f2433 100644
--- a/pythonFiles/tests/unittestadapter/helpers.py
+++ b/pythonFiles/tests/unittestadapter/helpers.py
@@ -5,13 +5,13 @@
 
 TEST_DATA_PATH = Path(Path(__file__).parent, ".data")
 
-# Helper function to test if two test trees are the same.
+
 def is_same_tree(tree1, tree2) -> bool:
+    """Helper function to test if two test trees are the same.
+
+    `is_same_tree` starts by comparing the root attributes, and then checks if all children are the same.
     """
-    Helper function to test if two test trees are the same by comparing the root attributes,
-    and checking if all children are the same.
-    """
-    # Compare the root
+    # Compare the root.
     if any(tree1[key] != tree2[key] for key in ["path", "name", "type_"]):
         return False
 
@@ -20,13 +20,13 @@ def is_same_tree(tree1, tree2) -> bool:
         children1 = tree1["children"]
         children2 = tree2["children"]
 
-        # Compare test nodes
+        # Compare test nodes.
         if len(children1) != len(children2):
             return False
         else:
             return all(is_same_tree(*pair) for pair in zip(children1, children2))
     elif "id_" in tree1 and "id_" in tree2:
-        # Compare test items
+        # Compare test items.
         return any(tree1[key] != tree2[key] for key in ["id_", "lineno"])
 
     return False
diff --git a/pythonFiles/tests/unittestadapter/test_discovery.py b/pythonFiles/tests/unittestadapter/test_discovery.py
index d22882c0df27..d712f325a09f 100644
--- a/pythonFiles/tests/unittestadapter/test_discovery.py
+++ b/pythonFiles/tests/unittestadapter/test_discovery.py
@@ -17,11 +17,8 @@
 from .helpers import TEST_DATA_PATH, is_same_tree
 
 
-@pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")
 def test_parse_port_option() -> None:
-    """
-    The parse_port function should parse and return the port passed as a command-line option.
-    """
+    """The parse_port function should parse and return the port passed as a command-line option."""
     expected = 9999
     args = [("--port", expected)]
 
@@ -30,11 +27,8 @@ def test_parse_port_option() -> None:
     assert expected == actual
 
 
-@pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")
 def test_parse_no_port_option() -> None:
-    """
-    The parse_port function should return a default port value if there was no --port command-line option.
-    """
+    """The parse_port function should return a default port value if there was no --port command-line option."""
     args = [("--foo", "something"), ("--bar", "another")]
 
     actual = parse_port(args)
@@ -42,10 +36,8 @@ def test_parse_no_port_option() -> None:
     assert DEFAULT_PORT == actual
 
 
-@pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")
 def test_parse_short_unittest_args() -> None:
-    """
-    The parse_unittest_args function should return the values for the start_dir, pattern, and top_level_dir arguments
+    """The parse_unittest_args function should return the values for the start_dir, pattern, and top_level_dir arguments
     when passed as command-line options with their shorthand form.
     """
     expected_start_dir = "foo"
@@ -64,10 +56,8 @@ def test_parse_short_unittest_args() -> None:
     assert expected_top_level_dir == actual_top_level_dir
 
 
-@pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")
 def test_parse_long_unittest_args() -> None:
-    """
-    The parse_unittest_args function should return the values for the start_dir, pattern, and top_level_dir arguments
+    """The parse_unittest_args function should return the values for the start_dir, pattern, and top_level_dir arguments
     when passed as command-line options with their long form.
     """
     expected_start_dir = "foo"
@@ -86,10 +76,8 @@ def test_parse_long_unittest_args() -> None:
     assert expected_top_level_dir == actual_top_level_dir
 
 
-@pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")
 def test_parse_no_unittest_args() -> None:
-    """
-    The parse_unittest_args function should return default values for the start_dir, pattern, and top_level_dir arguments
+    """The parse_unittest_args function should return default values for the start_dir, pattern, and top_level_dir arguments
     if they were not passed as command-line options, and ignore unrecognized arguments.
     """
     expected_start_dir = "."
@@ -106,10 +94,8 @@ def test_parse_no_unittest_args() -> None:
     assert expected_top_level_dir == actual_top_level_dir
 
 
-@pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")
 def test_simple_discovery() -> None:
-    """
-    The discover_tests function should return a dictionary with a "success" status, no errors, and a test tree
+    """The discover_tests function should return a dictionary with a "success" status, no errors, and a test tree
     if unittest discovery was performed successfully.
     """
     start_dir = TEST_DATA_PATH.__str__()
@@ -159,10 +145,8 @@ def test_simple_discovery() -> None:
     assert "errors" not in actual
 
 
-@pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")
 def test_empty_discovery() -> None:
-    """
-    The discover_tests function should return a dictionary with a "success" status, no errors, and no test tree
+    """The discover_tests function should return a dictionary with a "success" status, no errors, and no test tree
     if unittest discovery was performed successfully but no tests were found.
     """
     start_dir = TEST_DATA_PATH.__str__()
@@ -175,13 +159,11 @@ def test_empty_discovery() -> None:
     assert "errors" not in actual
 
 
-@pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")
 def test_error_discovery() -> None:
-    """
-    The discover_tests function should return a dictionary with an "error" status, the discovered tests, and a list of errors
+    """The discover_tests function should return a dictionary with an "error" status, the discovered tests, and a list of errors
     if unittest discovery failed at some point.
     """
-    # Discover tests in .data/discovery_error/
+    # Discover tests in .data/discovery_error/.
     start_dir = PurePath(TEST_DATA_PATH, "discovery_error").__str__()
     pattern = "file*"
 
diff --git a/pythonFiles/tests/unittestadapter/test_utils.py b/pythonFiles/tests/unittestadapter/test_utils.py
index 4015e316194e..bb6e57613121 100644
--- a/pythonFiles/tests/unittestadapter/test_utils.py
+++ b/pythonFiles/tests/unittestadapter/test_utils.py
@@ -18,11 +18,8 @@
 from .helpers import TEST_DATA_PATH, is_same_tree
 
 
-@pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")
 def test_simple_test_cases() -> None:
-    """
-    The get_test_case fuction should return tests from the test suite.
-    """
+    """The get_test_case fuction should return tests from the test suite."""
 
     expected = [
         "utils_simple_cases.CaseOne.test_one",
@@ -30,26 +27,22 @@ def test_simple_test_cases() -> None:
     ]
     actual = []
 
-    # Discover tests in .data/utils_simple_cases.py
+    # Discover tests in .data/utils_simple_cases.py.
     start_dir = TEST_DATA_PATH.__str__()
     pattern = "utils_simple_cases*"
 
     loader = unittest.TestLoader()
     suite = loader.discover(start_dir, pattern)
 
-    # Iterate on get_test_case and save the test id
+    # Iterate on get_test_case and save the test id.
     for test in get_test_case(suite):
         actual.append(test.id())
 
     assert expected == actual
 
 
-@pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")
 def test_nested_test_cases() -> None:
-    """
-    The get_test_case fuction should return tests from all test suites,
-    even those in subfolders.
-    """
+    """The get_test_case fuction should return tests from all test suites, even those in subfolders."""
 
     expected = [
         "file_one.CaseTwoFileOne.test_one",
@@ -59,25 +52,22 @@ def test_nested_test_cases() -> None:
     ]
     actual = []
 
-    # Discover tests in .data/utils_nested_cases/
+    # Discover tests in .data/utils_nested_cases/.
     start_dir = PurePath(TEST_DATA_PATH, "utils_nested_cases").__str__()
     pattern = "file*"
 
     loader = unittest.TestLoader()
     suite = loader.discover(start_dir, pattern)
 
-    # Iterate on get_test_case and save the test id
+    # Iterate on get_test_case and save the test id.
     for test in get_test_case(suite):
         actual.append(test.id())
 
     assert expected == actual
 
 
-@pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")
 def test_get_existing_child_node() -> None:
-    """
-    The get_child_node fuction should return the child node of a test tree if it exists.
-    """
+    """The get_child_node fuction should return the child node of a test tree if it exists."""
 
     tree: TestNode = {
         "name": "root",
@@ -120,11 +110,8 @@ def test_get_existing_child_node() -> None:
     assert initial_len == post_len
 
 
-@pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")
 def test_no_existing_child_node() -> None:
-    """
-    The get_child_node fuction should add a child node to a test tree and return it if it does not exist.
-    """
+    """The get_child_node fuction should add a child node to a test tree and return it if it does not exist."""
 
     tree: TestNode = {
         "name": "root",
@@ -169,13 +156,10 @@ def test_no_existing_child_node() -> None:
     assert initial_len < post_len
 
 
-@pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")
 def test_build_simple_tree() -> None:
-    """
-    The build_test_tree function should build and return a test tree from discovered test suites, and an empty list of errors if there are none in the discovered data.
-    """
+    """The build_test_tree function should build and return a test tree from discovered test suites, and an empty list of errors if there are none in the discovered data."""
 
-    # Discovery tests in utils_simple_tree.py
+    # Discovery tests in utils_simple_tree.py.
     start_dir = TEST_DATA_PATH.__str__()
     pattern = "utils_simple_tree*"
     file_path = PurePath(TEST_DATA_PATH, "utils_simple_tree.py").__str__()
@@ -224,11 +208,8 @@ def test_build_simple_tree() -> None:
     assert not errors
 
 
-@pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3 or higher")
 def test_build_empty_tree() -> None:
-    """
-    The build_test_tree function should return None if there are no discovered test suites, and an empty list of errors if there are none in the discovered data
-    """
+    """The build_test_tree function should return None if there are no discovered test suites, and an empty list of errors if there are none in the discovered data."""
 
     start_dir = TEST_DATA_PATH.__str__()
     pattern = "does_not_exist*"
@@ -239,6 +220,5 @@ def test_build_empty_tree() -> None:
     suite = loader.discover(start_dir, pattern)
     tests, errors = build_test_tree(suite, start_dir)
 
-    # Build tree
     assert expected == tests
     assert not errors
diff --git a/pythonFiles/unittestadapter/discovery.py b/pythonFiles/unittestadapter/discovery.py
index 4f79c45558e0..0345c1b2284d 100644
--- a/pythonFiles/unittestadapter/discovery.py
+++ b/pythonFiles/unittestadapter/discovery.py
@@ -26,12 +26,12 @@
 
 
 def parse_port(args: List[Arguments]) -> int:
+    """Parse command-line arguments that should be processed by the script.
+
+    So far that only includes the port number that it needs to connect to.
+    The port is passed to the discovery.py script when it is executed, and
+    defaults to DEFAULT_PORT if it can't be parsed.
     """
-    Parse command-line arguments that should be processed by the script,
-    for example the port number that it needs to connect to.
-    """
-    # The port is passed to the discovery.py script when it is executed,
-    # defaults to DEFAULT_PORT if it can't be parsed.
     port = DEFAULT_PORT
     for opt in args:
         if opt[0] == "--port":
@@ -40,9 +40,9 @@ def parse_port(args: List[Arguments]) -> int:
 
 
 def parse_unittest_args(args: List[Arguments]) -> Tuple[str, str, Union[str, None]]:
-    """
-    Parse command-line arguments that should be forwarded to unittest.
-    Unittest arguments are: -v, -s, -p, -t.
+    """Parse command-line arguments that should be forwarded to unittest.
+    Valid unittest arguments are: -v, -s, -p, -t and their long-form counterparts,
+    however we only care about the last three.
     """
     pattern: str = "test*.py"
     start_dir: str = "."
@@ -60,12 +60,33 @@ def parse_unittest_args(args: List[Arguments]) -> Tuple[str, str, Union[str, Non
 
 
 def discover_tests(start_dir, pattern, top_level_dir) -> Dict[str, Any]:
-    """
-    Unittest test discovery function, that returns a payload dictionary with the following keys:
+    """Unittest test discovery function, that returns a payload dictionary with the discovery status and results.
+
+    The payload can contain the following keys:
     - cwd: Absolute path to the test start directory;
     - status: Test discovery status, can be "success" or "error";
     - tests: Discoverered tests if any, not present otherwise. Note that the status can be "error" but the payload can still contain tests;
     - errors: Discovery errors if any, not present otherwise.
+
+    Payload format for a successful discovery:
+    {
+        "status": "success",
+        "cwd": <test discovery directory>,
+        "tests": <test tree>
+    }
+
+    Payload format for a successful discovery with no tests:
+    {
+        "status": "success",
+        "cwd": <test discovery directory>,
+    }
+
+    Payload format when there are errors:
+    {
+        "cwd": <test discovery directory>
+        "errors": [list of errors]
+        "status": "error",
+    }
     """
     cwd = os.path.abspath(start_dir)
     payload = {"cwd": cwd, "status": "success"}
@@ -87,33 +108,11 @@ def discover_tests(start_dir, pattern, top_level_dir) -> Dict[str, Any]:
         payload["status"] = "error"
         payload["errors"] = errors
 
-    # Connect to the TypeScript side and send payload.
-
-    # Payload format for a successful discovery:
-    # {
-    #     "status": "success",
-    #     "cwd": <test discovery directory>,
-    #     "tests": <test tree>
-    # }
-
-    # Payload format for a successful discovery with no tests:
-    # {
-    #     "status": "success",
-    #     "cwd": <test discovery directory>,
-    # }
-
-    # Payload format when there are errors:
-    # {
-    #     "cwd": <test discovery directory>
-    #     "errors": [list of errors]
-    #     "status": "error",
-    # }
-
     return payload
 
 
 if __name__ == "__main__":
-    # Get unittest discovery arguments
+    # Get unittest discovery arguments.
     argv = sys.argv[1:]
     index = argv.index("--udiscovery")
 
diff --git a/pythonFiles/unittestadapter/utils.py b/pythonFiles/unittestadapter/utils.py
index 3c16de392a82..bde90e86a463 100644
--- a/pythonFiles/unittestadapter/utils.py
+++ b/pythonFiles/unittestadapter/utils.py
@@ -36,9 +36,7 @@ class TestNode(TestData):
 
 
 def get_test_case(suite):
-    """
-    Iterate through a unittest test suite and return all test cases.
-    """
+    """Iterate through a unittest test suite and return all test cases."""
     for test in suite:
         if isinstance(test, unittest.TestCase):
             yield test
@@ -48,9 +46,7 @@ def get_test_case(suite):
 
 
 def get_source_line(obj) -> str:
-    """
-    Get the line number of a test case start line.
-    """
+    """Get the line number of a test case start line."""
     try:
         sourcelines, lineno = inspect.getsourcelines(obj)
     except:
@@ -70,9 +66,7 @@ def get_source_line(obj) -> str:
 
 
 def build_test_node(path: str, name: str, type_: TestNodeTypeEnum) -> TestNode:
-    """
-    Build a test node with no children. A test node can be a folder, a file or a class.
-    """
+    """Build a test node with no children. A test node can be a folder, a file or a class."""
     return {
         "path": path,
         "name": name,
@@ -84,10 +78,7 @@ def build_test_node(path: str, name: str, type_: TestNodeTypeEnum) -> TestNode:
 def get_child_node(
     name: str, path: str, type_: TestNodeTypeEnum, root: TestNode
 ) -> TestNode:
-    """
-    Find a child node in a test tree given its name and type.
-    If the node doesn't exist, create it.
-    """
+    """Find a child node in a test tree given its name and type. If the node doesn't exist, create it."""
     try:
         result = next(
             node
@@ -104,10 +95,10 @@ def get_child_node(
 def build_test_tree(
     suite: unittest.TestSuite, test_directory: str
 ) -> Tuple[Union[TestNode, None], List[str]]:
-    """
-    Build a test tree from a unittest test suite.
+    """Build a test tree from a unittest test suite.
+
     This function returns the test tree, and any errors found by unittest.
-    If no tests were discovered, return None and a list of errors (if any).
+    If no tests were discovered, return `None` and a list of errors (if any).
 
     Test tree structure:
     {
@@ -150,7 +141,7 @@ def build_test_tree(
         if test_id.startswith("unittest.loader._FailedTest"):
             errors.append(test_case._exception.__str__())  # type: ignore
         else:
-            # Get test path components
+            # Get test path components.
             folders = test_id.split(".")
             function_name, class_name, filename = folders[:3]
             py_filename = f"{filename}.py"
@@ -166,23 +157,23 @@ def build_test_tree(
                     current_node,
                 )
 
-            # Find/build file node
+            # Find/build file node.
             path_components = [test_directory] + folders + [py_filename]
             file_path = pathlib.PurePath("/".join(path_components)).__str__()
             current_node = get_child_node(
                 py_filename, file_path, TestNodeTypeEnum.file, current_node
             )
 
-            # Find/build class node
+            # Find/build class node.
             current_node = get_child_node(
                 class_name, file_path, TestNodeTypeEnum.class_, current_node
             )
 
-            # Get test line number
+            # Get test line number.
             test_method = getattr(test_case, test_case._testMethodName)
             lineno = get_source_line(test_method)
 
-            # Add test
+            # Add test node.
             test_node: TestItem = {
                 "id_": test_id,
                 "name": function_name,

From 7469a7aa819634c36a1b33aa7fa3a3dbfca78602 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Fri, 14 Jan 2022 10:30:37 -0800
Subject: [PATCH 50/87] Parametrize + fix tests

---
 pythonFiles/tests/unittestadapter/helpers.py  |   2 +-
 .../tests/unittestadapter/test_discovery.py   | 117 +++++++-----------
 .../tests/unittestadapter/test_utils.py       |  62 ++++------
 pythonFiles/unittestadapter/utils.py          |   9 +-
 4 files changed, 79 insertions(+), 111 deletions(-)

diff --git a/pythonFiles/tests/unittestadapter/helpers.py b/pythonFiles/tests/unittestadapter/helpers.py
index 93c9845f2433..447afb67061d 100644
--- a/pythonFiles/tests/unittestadapter/helpers.py
+++ b/pythonFiles/tests/unittestadapter/helpers.py
@@ -27,6 +27,6 @@ def is_same_tree(tree1, tree2) -> bool:
             return all(is_same_tree(*pair) for pair in zip(children1, children2))
     elif "id_" in tree1 and "id_" in tree2:
         # Compare test items.
-        return any(tree1[key] != tree2[key] for key in ["id_", "lineno"])
+        return all(tree1[key] == tree2[key] for key in ["id_", "lineno"])
 
     return False
diff --git a/pythonFiles/tests/unittestadapter/test_discovery.py b/pythonFiles/tests/unittestadapter/test_discovery.py
index d712f325a09f..14012668c3d9 100644
--- a/pythonFiles/tests/unittestadapter/test_discovery.py
+++ b/pythonFiles/tests/unittestadapter/test_discovery.py
@@ -1,7 +1,6 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-import sys
 import pytest
 
 from pathlib import PurePath
@@ -17,81 +16,57 @@
 from .helpers import TEST_DATA_PATH, is_same_tree
 
 
-def test_parse_port_option() -> None:
-    """The parse_port function should parse and return the port passed as a command-line option."""
-    expected = 9999
-    args = [("--port", expected)]
+@pytest.mark.parametrize(
+    "args, expected",
+    [
+        ([("--port", 9999)], 9999),
+        ([("--foo", "something"), ("--bar", "another")], DEFAULT_PORT),
+    ],
+)
+def test_parse_port_option(args, expected) -> None:
+    """The parse_port function should parse and return the port passed as a command-line option.
 
+    If there was no --port command-line option, it should return a default port value.
+    """
     actual = parse_port(args)
 
     assert expected == actual
 
 
-def test_parse_no_port_option() -> None:
-    """The parse_port function should return a default port value if there was no --port command-line option."""
-    args = [("--foo", "something"), ("--bar", "another")]
-
-    actual = parse_port(args)
-
-    assert DEFAULT_PORT == actual
-
-
-def test_parse_short_unittest_args() -> None:
-    """The parse_unittest_args function should return the values for the start_dir, pattern, and top_level_dir arguments
-    when passed as command-line options with their shorthand form.
-    """
-    expected_start_dir = "foo"
-    expected_pattern = "bar*"
-    expected_top_level_dir = "baz"
-    args = [
-        ("-s", expected_start_dir),
-        ("-p", expected_pattern),
-        ("-t", expected_top_level_dir),
-    ]
-
-    actual_start_dir, actual_pattern, actual_top_level_dir = parse_unittest_args(args)
-
-    assert expected_start_dir == actual_start_dir
-    assert expected_pattern == actual_pattern
-    assert expected_top_level_dir == actual_top_level_dir
-
-
-def test_parse_long_unittest_args() -> None:
-    """The parse_unittest_args function should return the values for the start_dir, pattern, and top_level_dir arguments
-    when passed as command-line options with their long form.
-    """
-    expected_start_dir = "foo"
-    expected_pattern = "bar*"
-    expected_top_level_dir = "baz"
-    args = [
-        ("--start-directory", expected_start_dir),
-        ("--pattern", expected_pattern),
-        ("--top-level-directory", expected_top_level_dir),
-    ]
-
-    actual_start_dir, actual_pattern, actual_top_level_dir = parse_unittest_args(args)
-
-    assert expected_start_dir == actual_start_dir
-    assert expected_pattern == actual_pattern
-    assert expected_top_level_dir == actual_top_level_dir
-
-
-def test_parse_no_unittest_args() -> None:
-    """The parse_unittest_args function should return default values for the start_dir, pattern, and top_level_dir arguments
-    if they were not passed as command-line options, and ignore unrecognized arguments.
+@pytest.mark.parametrize(
+    "args, expected",
+    [
+        (
+            [
+                ("-s", "foo"),
+                ("-p", "bar*"),
+                ("-t", "baz"),
+            ],
+            ("foo", "bar*", "baz"),
+        ),
+        (
+            [
+                ("--start-directory", "foo"),
+                ("--pattern", "bar*"),
+                ("--top-level-directory", "baz"),
+            ],
+            ("foo", "bar*", "baz"),
+        ),
+        (
+            [
+                ("--foo", "something"),
+            ],
+            (".", "test*.py", None),
+        ),
+    ],
+)
+def test_parse_short_unittest_args(args, expected) -> None:
+    """The parse_unittest_args function should return values for the start_dir, pattern, and top_level_dir arguments
+    when passed as command-line options, and ignore unrecognized arguments.
     """
-    expected_start_dir = "."
-    expected_pattern = "test*.py"
-    expected_top_level_dir = None
-    args = [
-        ("--foo", "something"),
-    ]
-
-    actual_start_dir, actual_pattern, actual_top_level_dir = parse_unittest_args(args)
+    actual = parse_unittest_args(args)
 
-    assert expected_start_dir == actual_start_dir
-    assert expected_pattern == actual_pattern
-    assert expected_top_level_dir == actual_top_level_dir
+    assert actual == expected
 
 
 def test_simple_discovery() -> None:
@@ -185,14 +160,14 @@ def test_error_discovery() -> None:
                         "type_": TestNodeTypeEnum.class_,
                         "children": [
                             {
-                                "id_": "discovery_error.DiscoveryErrorTwo.test_one",
+                                "id_": "file_two.DiscoveryErrorTwo.test_one",
                                 "name": "test_one",
                                 "path": file_path,
                                 "type_": TestNodeTypeEnum.test,
                                 "lineno": "14",
                             },
                             {
-                                "id_": "discovery_error.DiscoveryErrorTwo.test_two",
+                                "id_": "file_two.DiscoveryErrorTwo.test_two",
                                 "name": "test_two",
                                 "path": file_path,
                                 "type_": TestNodeTypeEnum.test,
@@ -208,5 +183,5 @@ def test_error_discovery() -> None:
     actual = discover_tests(start_dir, pattern, None)
 
     assert actual["status"] == "error"
-    is_same_tree(expected, actual["tests"])
+    assert is_same_tree(expected, actual["tests"])
     assert len(actual["errors"]) == 1
diff --git a/pythonFiles/tests/unittestadapter/test_utils.py b/pythonFiles/tests/unittestadapter/test_utils.py
index bb6e57613121..87132412ddce 100644
--- a/pythonFiles/tests/unittestadapter/test_utils.py
+++ b/pythonFiles/tests/unittestadapter/test_utils.py
@@ -1,7 +1,6 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-import sys
 import pytest
 
 import unittest
@@ -18,43 +17,36 @@
 from .helpers import TEST_DATA_PATH, is_same_tree
 
 
-def test_simple_test_cases() -> None:
-    """The get_test_case fuction should return tests from the test suite."""
-
-    expected = [
-        "utils_simple_cases.CaseOne.test_one",
-        "utils_simple_cases.CaseOne.test_two",
-    ]
-    actual = []
-
-    # Discover tests in .data/utils_simple_cases.py.
-    start_dir = TEST_DATA_PATH.__str__()
-    pattern = "utils_simple_cases*"
-
-    loader = unittest.TestLoader()
-    suite = loader.discover(start_dir, pattern)
-
-    # Iterate on get_test_case and save the test id.
-    for test in get_test_case(suite):
-        actual.append(test.id())
-
-    assert expected == actual
-
-
-def test_nested_test_cases() -> None:
-    """The get_test_case fuction should return tests from all test suites, even those in subfolders."""
+@pytest.mark.parametrize(
+    "directory, pattern, expected",
+    [
+        (
+            ".",
+            "utils_simple_cases*",
+            [
+                "utils_simple_cases.CaseOne.test_one",
+                "utils_simple_cases.CaseOne.test_two",
+            ],
+        ),
+        (
+            "utils_nested_cases",
+            "file*",
+            [
+                "file_one.CaseTwoFileOne.test_one",
+                "file_one.CaseTwoFileOne.test_two",
+                "folder.file_two.CaseTwoFileTwo.test_one",
+                "folder.file_two.CaseTwoFileTwo.test_two",
+            ],
+        ),
+    ],
+)
+def test_simple_test_cases(directory, pattern, expected) -> None:
+    """The get_test_case fuction should return tests from all test suites."""
 
-    expected = [
-        "file_one.CaseTwoFileOne.test_one",
-        "file_one.CaseTwoFileOne.test_two",
-        "folder.file_two.CaseTwoFileTwo.test_one",
-        "folder.file_two.CaseTwoFileTwo.test_two",
-    ]
     actual = []
 
-    # Discover tests in .data/utils_nested_cases/.
-    start_dir = PurePath(TEST_DATA_PATH, "utils_nested_cases").__str__()
-    pattern = "file*"
+    # Discover tests in .data/<directory>.
+    start_dir = PurePath(TEST_DATA_PATH, directory).__str__()
 
     loader = unittest.TestLoader()
     suite = loader.discover(start_dir, pattern)
diff --git a/pythonFiles/unittestadapter/utils.py b/pythonFiles/unittestadapter/utils.py
index bde90e86a463..abbf7b8cf2fd 100644
--- a/pythonFiles/unittestadapter/utils.py
+++ b/pythonFiles/unittestadapter/utils.py
@@ -141,14 +141,15 @@ def build_test_tree(
         if test_id.startswith("unittest.loader._FailedTest"):
             errors.append(test_case._exception.__str__())  # type: ignore
         else:
-            # Get test path components.
-            folders = test_id.split(".")
-            function_name, class_name, filename = folders[:3]
+            # Get the static test path components: filename, class name and function name.
+            components = test_id.split(".")
+            filename, class_name, function_name = components[:3]
             py_filename = f"{filename}.py"
+            folders = components[:-3]
 
             current_node = root
 
-            # Find/build folder nodes.
+            # Find/build nodes for the intermediate folders in the test path.
             for folder in folders:
                 current_node = get_child_node(
                     folder,

From a07bf7c1ea4cc61b197e570acce7d82813cb2674 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Fri, 14 Jan 2022 10:33:40 -0800
Subject: [PATCH 51/87] import pathlib instead of from pathlib import

---
 pythonFiles/tests/unittestadapter/helpers.py        | 4 ++--
 pythonFiles/tests/unittestadapter/test_discovery.py | 8 ++++----
 pythonFiles/tests/unittestadapter/test_utils.py     | 7 ++++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pythonFiles/tests/unittestadapter/helpers.py b/pythonFiles/tests/unittestadapter/helpers.py
index 447afb67061d..346f142ff81e 100644
--- a/pythonFiles/tests/unittestadapter/helpers.py
+++ b/pythonFiles/tests/unittestadapter/helpers.py
@@ -1,9 +1,9 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-from pathlib import Path
+import pathlib
 
-TEST_DATA_PATH = Path(Path(__file__).parent, ".data")
+TEST_DATA_PATH = pathlib.Path(pathlib.Path(__file__).parent, ".data")
 
 
 def is_same_tree(tree1, tree2) -> bool:
diff --git a/pythonFiles/tests/unittestadapter/test_discovery.py b/pythonFiles/tests/unittestadapter/test_discovery.py
index 14012668c3d9..9e55d19f990a 100644
--- a/pythonFiles/tests/unittestadapter/test_discovery.py
+++ b/pythonFiles/tests/unittestadapter/test_discovery.py
@@ -3,7 +3,7 @@
 
 import pytest
 
-from pathlib import PurePath
+import pathlib
 
 from unittestadapter.discovery import (
     DEFAULT_PORT,
@@ -75,7 +75,7 @@ def test_simple_discovery() -> None:
     """
     start_dir = TEST_DATA_PATH.__str__()
     pattern = "discovery_simple*"
-    file_path = PurePath(TEST_DATA_PATH, "discovery_simple.py").__str__()
+    file_path = pathlib.PurePath(TEST_DATA_PATH, "discovery_simple.py").__str__()
 
     expected = {
         "path": start_dir,
@@ -139,10 +139,10 @@ def test_error_discovery() -> None:
     if unittest discovery failed at some point.
     """
     # Discover tests in .data/discovery_error/.
-    start_dir = PurePath(TEST_DATA_PATH, "discovery_error").__str__()
+    start_dir = pathlib.PurePath(TEST_DATA_PATH, "discovery_error").__str__()
     pattern = "file*"
 
-    file_path = PurePath(start_dir, "file_two.py").__str__()
+    file_path = pathlib.PurePath(start_dir, "file_two.py").__str__()
 
     expected = {
         "path": start_dir,
diff --git a/pythonFiles/tests/unittestadapter/test_utils.py b/pythonFiles/tests/unittestadapter/test_utils.py
index 87132412ddce..3295a3e0f924 100644
--- a/pythonFiles/tests/unittestadapter/test_utils.py
+++ b/pythonFiles/tests/unittestadapter/test_utils.py
@@ -3,8 +3,9 @@
 
 import pytest
 
+import pathlib
+
 import unittest
-from pathlib import PurePath
 
 from unittestadapter.utils import (
     build_test_tree,
@@ -46,7 +47,7 @@ def test_simple_test_cases(directory, pattern, expected) -> None:
     actual = []
 
     # Discover tests in .data/<directory>.
-    start_dir = PurePath(TEST_DATA_PATH, directory).__str__()
+    start_dir = pathlib.PurePath(TEST_DATA_PATH, directory).__str__()
 
     loader = unittest.TestLoader()
     suite = loader.discover(start_dir, pattern)
@@ -154,7 +155,7 @@ def test_build_simple_tree() -> None:
     # Discovery tests in utils_simple_tree.py.
     start_dir = TEST_DATA_PATH.__str__()
     pattern = "utils_simple_tree*"
-    file_path = PurePath(TEST_DATA_PATH, "utils_simple_tree.py").__str__()
+    file_path = pathlib.PurePath(TEST_DATA_PATH, "utils_simple_tree.py").__str__()
 
     expected: TestNode = {
         "path": start_dir,

From 13d76650031a1c1c08282d8055888458fd45099d Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Fri, 14 Jan 2022 10:47:24 -0800
Subject: [PATCH 52/87] Sort imports

---
 pythonFiles/tests/unittestadapter/test_discovery.py | 4 ++--
 pythonFiles/tests/unittestadapter/test_utils.py     | 9 ++++-----
 pythonFiles/unittestadapter/discovery.py            | 5 ++---
 pythonFiles/unittestadapter/utils.py                | 5 +++--
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/pythonFiles/tests/unittestadapter/test_discovery.py b/pythonFiles/tests/unittestadapter/test_discovery.py
index 9e55d19f990a..5ddd33e836e9 100644
--- a/pythonFiles/tests/unittestadapter/test_discovery.py
+++ b/pythonFiles/tests/unittestadapter/test_discovery.py
@@ -1,10 +1,10 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-import pytest
-
 import pathlib
 
+import pytest
+
 from unittestadapter.discovery import (
     DEFAULT_PORT,
     discover_tests,
diff --git a/pythonFiles/tests/unittestadapter/test_utils.py b/pythonFiles/tests/unittestadapter/test_utils.py
index 3295a3e0f924..05d4e5602ca2 100644
--- a/pythonFiles/tests/unittestadapter/test_utils.py
+++ b/pythonFiles/tests/unittestadapter/test_utils.py
@@ -1,18 +1,17 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-import pytest
-
 import pathlib
-
 import unittest
 
+import pytest
+
 from unittestadapter.utils import (
+    TestNode,
+    TestNodeTypeEnum,
     build_test_tree,
     get_child_node,
     get_test_case,
-    TestNode,
-    TestNodeTypeEnum,
 )
 
 from .helpers import TEST_DATA_PATH, is_same_tree
diff --git a/pythonFiles/unittestadapter/discovery.py b/pythonFiles/unittestadapter/discovery.py
index 0345c1b2284d..f7f05f04d894 100644
--- a/pythonFiles/unittestadapter/discovery.py
+++ b/pythonFiles/unittestadapter/discovery.py
@@ -3,13 +3,13 @@
 
 import getopt
 import os
-from typing import Any, Dict, List, Tuple, Union
 import sys
 import traceback
 import unittest
 
-from .utils import build_test_tree
+from typing import Any, Dict, List, Tuple, Union
 
+from .utils import build_test_tree
 
 # Add the lib path to our sys path to find the httpx module.
 EXTENSION_ROOT = os.path.dirname(
@@ -19,7 +19,6 @@
 
 import httpx
 
-
 Arguments = Tuple[str, Any]
 
 DEFAULT_PORT = 45454
diff --git a/pythonFiles/unittestadapter/utils.py b/pythonFiles/unittestadapter/utils.py
index abbf7b8cf2fd..7d3037fded97 100644
--- a/pythonFiles/unittestadapter/utils.py
+++ b/pythonFiles/unittestadapter/utils.py
@@ -1,12 +1,13 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-from enum import Enum
 import inspect
 import pathlib
-from typing import List, Tuple, TypedDict, Union
 import unittest
 
+from enum import Enum
+from typing import List, Tuple, TypedDict, Union
+
 # Types
 
 

From b369e10f68d7ca5b118a0b2ff83ddffed1bc95ca Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Fri, 14 Jan 2022 10:57:13 -0800
Subject: [PATCH 53/87] do not use __str__

---
 pythonFiles/tests/unittestadapter/test_discovery.py | 11 ++++++-----
 pythonFiles/tests/unittestadapter/test_utils.py     |  9 +++++----
 pythonFiles/unittestadapter/utils.py                |  7 ++++---
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/pythonFiles/tests/unittestadapter/test_discovery.py b/pythonFiles/tests/unittestadapter/test_discovery.py
index 5ddd33e836e9..c3f331eb712c 100644
--- a/pythonFiles/tests/unittestadapter/test_discovery.py
+++ b/pythonFiles/tests/unittestadapter/test_discovery.py
@@ -1,6 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
+import os
 import pathlib
 
 import pytest
@@ -73,9 +74,9 @@ def test_simple_discovery() -> None:
     """The discover_tests function should return a dictionary with a "success" status, no errors, and a test tree
     if unittest discovery was performed successfully.
     """
-    start_dir = TEST_DATA_PATH.__str__()
+    start_dir = os.fsdecode(TEST_DATA_PATH)
     pattern = "discovery_simple*"
-    file_path = pathlib.PurePath(TEST_DATA_PATH, "discovery_simple.py").__str__()
+    file_path = os.fsdecode(pathlib.PurePath(TEST_DATA_PATH, "discovery_simple.py"))
 
     expected = {
         "path": start_dir,
@@ -124,7 +125,7 @@ def test_empty_discovery() -> None:
     """The discover_tests function should return a dictionary with a "success" status, no errors, and no test tree
     if unittest discovery was performed successfully but no tests were found.
     """
-    start_dir = TEST_DATA_PATH.__str__()
+    start_dir = os.fsdecode(TEST_DATA_PATH)
     pattern = "discovery_empty*"
 
     actual = discover_tests(start_dir, pattern, None)
@@ -139,10 +140,10 @@ def test_error_discovery() -> None:
     if unittest discovery failed at some point.
     """
     # Discover tests in .data/discovery_error/.
-    start_dir = pathlib.PurePath(TEST_DATA_PATH, "discovery_error").__str__()
+    start_dir = os.fsdecode(pathlib.PurePath(TEST_DATA_PATH, "discovery_error"))
     pattern = "file*"
 
-    file_path = pathlib.PurePath(start_dir, "file_two.py").__str__()
+    file_path = os.fsdecode(pathlib.PurePath(start_dir, "file_two.py"))
 
     expected = {
         "path": start_dir,
diff --git a/pythonFiles/tests/unittestadapter/test_utils.py b/pythonFiles/tests/unittestadapter/test_utils.py
index 05d4e5602ca2..57fc868d48c7 100644
--- a/pythonFiles/tests/unittestadapter/test_utils.py
+++ b/pythonFiles/tests/unittestadapter/test_utils.py
@@ -1,6 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
+import os
 import pathlib
 import unittest
 
@@ -46,7 +47,7 @@ def test_simple_test_cases(directory, pattern, expected) -> None:
     actual = []
 
     # Discover tests in .data/<directory>.
-    start_dir = pathlib.PurePath(TEST_DATA_PATH, directory).__str__()
+    start_dir = os.fsdecode(pathlib.PurePath(TEST_DATA_PATH, directory))
 
     loader = unittest.TestLoader()
     suite = loader.discover(start_dir, pattern)
@@ -152,9 +153,9 @@ def test_build_simple_tree() -> None:
     """The build_test_tree function should build and return a test tree from discovered test suites, and an empty list of errors if there are none in the discovered data."""
 
     # Discovery tests in utils_simple_tree.py.
-    start_dir = TEST_DATA_PATH.__str__()
+    start_dir = os.fsdecode(TEST_DATA_PATH)
     pattern = "utils_simple_tree*"
-    file_path = pathlib.PurePath(TEST_DATA_PATH, "utils_simple_tree.py").__str__()
+    file_path = os.fsdecode(pathlib.PurePath(TEST_DATA_PATH, "utils_simple_tree.py"))
 
     expected: TestNode = {
         "path": start_dir,
@@ -203,7 +204,7 @@ def test_build_simple_tree() -> None:
 def test_build_empty_tree() -> None:
     """The build_test_tree function should return None if there are no discovered test suites, and an empty list of errors if there are none in the discovered data."""
 
-    start_dir = TEST_DATA_PATH.__str__()
+    start_dir = os.fsdecode(TEST_DATA_PATH)
     pattern = "does_not_exist*"
 
     expected = None
diff --git a/pythonFiles/unittestadapter/utils.py b/pythonFiles/unittestadapter/utils.py
index 7d3037fded97..507be333ef38 100644
--- a/pythonFiles/unittestadapter/utils.py
+++ b/pythonFiles/unittestadapter/utils.py
@@ -2,6 +2,7 @@
 # Licensed under the MIT License.
 
 import inspect
+import os
 import pathlib
 import unittest
 
@@ -140,7 +141,7 @@ def build_test_tree(
     for test_case in get_test_case(suite):
         test_id = test_case.id()
         if test_id.startswith("unittest.loader._FailedTest"):
-            errors.append(test_case._exception.__str__())  # type: ignore
+            errors.append(str(test_case._exception))  # type: ignore
         else:
             # Get the static test path components: filename, class name and function name.
             components = test_id.split(".")
@@ -154,14 +155,14 @@ def build_test_tree(
             for folder in folders:
                 current_node = get_child_node(
                     folder,
-                    pathlib.PurePath(current_node["path"], folder).__str__(),
+                    os.fsdecode(pathlib.PurePath(current_node["path"], folder)),
                     TestNodeTypeEnum.folder,
                     current_node,
                 )
 
             # Find/build file node.
             path_components = [test_directory] + folders + [py_filename]
-            file_path = pathlib.PurePath("/".join(path_components)).__str__()
+            file_path = os.fsdecode(pathlib.PurePath("/".join(path_components)))
             current_node = get_child_node(
                 py_filename, file_path, TestNodeTypeEnum.file, current_node
             )

From ad36883890f45afd25f9070b20c9f457b4ceef71 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Fri, 14 Jan 2022 14:49:50 -0800
Subject: [PATCH 54/87] Address remaining comments

---
 .../tests/unittestadapter/test_discovery.py   | 33 +++++----
 pythonFiles/unittestadapter/discovery.py      | 72 +++++++++++--------
 pythonFiles/unittestadapter/utils.py          |  4 +-
 requirements.in                               |  1 +
 requirements.txt                              |  4 +-
 5 files changed, 63 insertions(+), 51 deletions(-)

diff --git a/pythonFiles/tests/unittestadapter/test_discovery.py b/pythonFiles/tests/unittestadapter/test_discovery.py
index c3f331eb712c..0bcfbb3696de 100644
--- a/pythonFiles/tests/unittestadapter/test_discovery.py
+++ b/pythonFiles/tests/unittestadapter/test_discovery.py
@@ -22,12 +22,14 @@
     [
         ([("--port", 9999)], 9999),
         ([("--foo", "something"), ("--bar", "another")], DEFAULT_PORT),
+        ([("--port", 4444), ("--foo", "something"), ("--port", 9999)], 9999),
     ],
 )
 def test_parse_port_option(args, expected) -> None:
     """The parse_port function should parse and return the port passed as a command-line option.
 
-    If there was no --port command-line option, it should return a default port value.
+    If there was no --port command-line option, it should return the default port value.
+    If there are multiple --port options, the last one wins.
     """
     actual = parse_port(args)
 
@@ -38,30 +40,27 @@ def test_parse_port_option(args, expected) -> None:
     "args, expected",
     [
         (
-            [
-                ("-s", "foo"),
-                ("-p", "bar*"),
-                ("-t", "baz"),
-            ],
-            ("foo", "bar*", "baz"),
+            ["-s", "something", "-p", "other*", "-t", "else"],
+            ("something", "other*", "else"),
         ),
         (
             [
-                ("--start-directory", "foo"),
-                ("--pattern", "bar*"),
-                ("--top-level-directory", "baz"),
+                "--start-directory",
+                "foo",
+                "--pattern",
+                "bar*",
+                "--top-level-directory",
+                "baz",
             ],
             ("foo", "bar*", "baz"),
         ),
         (
-            [
-                ("--foo", "something"),
-            ],
+            ["--foo", "something"],
             (".", "test*.py", None),
         ),
     ],
 )
-def test_parse_short_unittest_args(args, expected) -> None:
+def test_parse_unittest_args(args, expected) -> None:
     """The parse_unittest_args function should return values for the start_dir, pattern, and top_level_dir arguments
     when passed as command-line options, and ignore unrecognized arguments.
     """
@@ -117,7 +116,7 @@ def test_simple_discovery() -> None:
     actual = discover_tests(start_dir, pattern, None)
 
     assert actual["status"] == "success"
-    assert is_same_tree(actual["tests"], expected)
+    assert is_same_tree(actual.get("tests"), expected)
     assert "errors" not in actual
 
 
@@ -184,5 +183,5 @@ def test_error_discovery() -> None:
     actual = discover_tests(start_dir, pattern, None)
 
     assert actual["status"] == "error"
-    assert is_same_tree(expected, actual["tests"])
-    assert len(actual["errors"]) == 1
+    assert is_same_tree(expected, actual.get("tests"))
+    assert len(actual.get("errors", [])) == 1
diff --git a/pythonFiles/unittestadapter/discovery.py b/pythonFiles/unittestadapter/discovery.py
index f7f05f04d894..224c6fda6eea 100644
--- a/pythonFiles/unittestadapter/discovery.py
+++ b/pythonFiles/unittestadapter/discovery.py
@@ -1,15 +1,18 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
+import argparse
+import enum
 import getopt
 import os
 import sys
 import traceback
 import unittest
+from typing import Any, List, Literal, Optional, Tuple, TypedDict, Union
 
-from typing import Any, Dict, List, Tuple, Union
+from typing_extensions import NotRequired
 
-from .utils import build_test_tree
+from .utils import TestNode, build_test_tree
 
 # Add the lib path to our sys path to find the httpx module.
 EXTENSION_ROOT = os.path.dirname(
@@ -30,38 +33,51 @@ def parse_port(args: List[Arguments]) -> int:
     So far that only includes the port number that it needs to connect to.
     The port is passed to the discovery.py script when it is executed, and
     defaults to DEFAULT_PORT if it can't be parsed.
+    If there are several --port arguments, the value returned by parse_port will be the value of the last --port argument.
     """
-    port = DEFAULT_PORT
-    for opt in args:
-        if opt[0] == "--port":
-            port = opt[1]
-    return port
+    return dict(args).get("--port", DEFAULT_PORT)
 
 
-def parse_unittest_args(args: List[Arguments]) -> Tuple[str, str, Union[str, None]]:
+def parse_unittest_args(args: List[str]) -> Tuple[str, str, Union[str, None]]:
     """Parse command-line arguments that should be forwarded to unittest.
+
     Valid unittest arguments are: -v, -s, -p, -t and their long-form counterparts,
     however we only care about the last three.
+
+    The returned tuple contains the following items
+    - start_directory: The directory where to start discovery, defaults to .
+    - pattern: The pattern to match test files, defaults to test*.py
+    - top_level_directory: The top-level directory of the project, defaults to None, and unittest will use start_directory behind the scenes.
     """
-    pattern: str = "test*.py"
-    start_dir: str = "."
-    top_level_dir: Union[str, None] = None
 
-    for opt in args:
-        if opt[0] in ("-s", "--start-directory"):
-            start_dir = opt[1]
-        elif opt[0] in ("-p", "--pattern"):
-            pattern = opt[1]
-        elif opt[0] in ("-t", "--top-level-directory"):
-            top_level_dir = opt[1]
+    arg_parser = argparse.ArgumentParser()
+    arg_parser.add_argument("--start-directory", "-s", default=".")
+    arg_parser.add_argument("--pattern", "-p", default="test*.py")
+    arg_parser.add_argument("--top-level-directory", "-t", default=None)
+
+    parsed_args, _ = arg_parser.parse_known_args(args)
+
+    return (
+        parsed_args.start_directory,
+        parsed_args.pattern,
+        parsed_args.top_level_directory,
+    )
 
-    return start_dir, pattern, top_level_dir
 
+class PayloadDict(TypedDict):
+    cwd: str
+    status: Literal["success", "error"]
+    tests: NotRequired[TestNode]
+    errors: NotRequired[List[str]]
 
-def discover_tests(start_dir, pattern, top_level_dir) -> Dict[str, Any]:
-    """Unittest test discovery function, that returns a payload dictionary with the discovery status and results.
 
-    The payload can contain the following keys:
+def discover_tests(
+    start_dir: str, pattern: str, top_level_dir: Optional[str]
+) -> PayloadDict:
+    """Returns a dictionary containing details of the discovered tests.
+
+    The returned dict has the following keys:
+
     - cwd: Absolute path to the test start directory;
     - status: Test discovery status, can be "success" or "error";
     - tests: Discoverered tests if any, not present otherwise. Note that the status can be "error" but the payload can still contain tests;
@@ -88,7 +104,7 @@ def discover_tests(start_dir, pattern, top_level_dir) -> Dict[str, Any]:
     }
     """
     cwd = os.path.abspath(start_dir)
-    payload = {"cwd": cwd, "status": "success"}
+    payload: PayloadDict = {"cwd": cwd, "status": "success"}
     tests = None
     errors = []
 
@@ -116,16 +132,10 @@ def discover_tests(start_dir, pattern, top_level_dir) -> Dict[str, Any]:
     index = argv.index("--udiscovery")
 
     script_args, _ = getopt.getopt(argv[:index], "", ["port="])
-    unittest_args, _ = getopt.getopt(
-        argv[index + 1 :],
-        "vs:p:t:",
-        ["start-directory=", "pattern=", "top-level-directory="],
-    )
-
-    start_dir, pattern, top_level_dir = parse_unittest_args(unittest_args)
+    start_dir, pattern, top_level_dir = parse_unittest_args(argv[index + 1 :])
 
     # Perform test discovery & send it over.
     payload = discover_tests(start_dir, pattern, top_level_dir)
 
     port = parse_port(script_args)
-    httpx.post(f"http://localhost:{port}", data=payload)
+    httpx.post(f"http://localhost:{port}", data=payload)  # type: ignore
diff --git a/pythonFiles/unittestadapter/utils.py b/pythonFiles/unittestadapter/utils.py
index 507be333ef38..ea43fb43e410 100644
--- a/pythonFiles/unittestadapter/utils.py
+++ b/pythonFiles/unittestadapter/utils.py
@@ -1,18 +1,18 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
+import enum
 import inspect
 import os
 import pathlib
 import unittest
 
-from enum import Enum
 from typing import List, Tuple, TypedDict, Union
 
 # Types
 
 
-class TestNodeTypeEnum(str, Enum):
+class TestNodeTypeEnum(enum.Enum):
     class_ = "class"
     file = "file"
     folder = "folder"
diff --git a/requirements.in b/requirements.in
index 0638c10e3747..dc09b9a1ffa5 100644
--- a/requirements.in
+++ b/requirements.in
@@ -4,6 +4,7 @@
 # 2) pip-compile --generate-hashes requirements.in
 
 # Unittest test adapter
+typing-extensions==4.0.1
 httpx==0.21.3
 
 # Sort Imports
diff --git a/requirements.txt b/requirements.txt
index d33b74f5010c..6dc61d3de585 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -54,4 +54,6 @@ sniffio==1.2.0 \
 typing-extensions==4.0.1 \
     --hash=sha256:4ca091dea149f945ec56afb48dae714f21e8692ef22a395223bcd328961b6a0e \
     --hash=sha256:7f001e5ac290a0c0401508864c7ec868be4e701886d5b573a9528ed3973d9d3b
-    # via anyio
+    # via
+    #   -r requirements.in
+    #   anyio

From c824944aa6db381edcb850c26fb2eed60f6b9c7b Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Fri, 14 Jan 2022 16:17:11 -0800
Subject: [PATCH 55/87] Last batch of comments

---
 .../tests/unittestadapter/test_discovery.py   |  7 ++---
 .../tests/unittestadapter/test_utils.py       | 29 +++++++++++--------
 pythonFiles/unittestadapter/discovery.py      | 16 +++++-----
 pythonFiles/unittestadapter/utils.py          |  1 -
 4 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/pythonFiles/tests/unittestadapter/test_discovery.py b/pythonFiles/tests/unittestadapter/test_discovery.py
index 0bcfbb3696de..36eb91c68fe2 100644
--- a/pythonFiles/tests/unittestadapter/test_discovery.py
+++ b/pythonFiles/tests/unittestadapter/test_discovery.py
@@ -5,7 +5,6 @@
 import pathlib
 
 import pytest
-
 from unittestadapter.discovery import (
     DEFAULT_PORT,
     discover_tests,
@@ -20,9 +19,9 @@
 @pytest.mark.parametrize(
     "args, expected",
     [
-        ([("--port", 9999)], 9999),
-        ([("--foo", "something"), ("--bar", "another")], DEFAULT_PORT),
-        ([("--port", 4444), ("--foo", "something"), ("--port", 9999)], 9999),
+        (["--port", "6767"], 6767),
+        (["--foo", "something", "--bar", "another"], int(DEFAULT_PORT)),
+        (["--port", "4444", "--foo", "something", "--port", "9999"], 9999),
     ],
 )
 def test_parse_port_option(args, expected) -> None:
diff --git a/pythonFiles/tests/unittestadapter/test_utils.py b/pythonFiles/tests/unittestadapter/test_utils.py
index 57fc868d48c7..e9eb5035bebe 100644
--- a/pythonFiles/tests/unittestadapter/test_utils.py
+++ b/pythonFiles/tests/unittestadapter/test_utils.py
@@ -6,7 +6,6 @@
 import unittest
 
 import pytest
-
 from unittestadapter.utils import (
     TestNode,
     TestNodeTypeEnum,
@@ -95,12 +94,11 @@ def test_get_existing_child_node() -> None:
         ],
     }
 
-    initial_len = len(tree["children"])
-    result = get_child_node("childTwo", "child/two", TestNodeTypeEnum.folder, tree)
-    post_len = len(tree["children"])
+    get_child_node("childTwo", "child/two", TestNodeTypeEnum.folder, tree)
+    tree_copy = tree.copy()
 
-    assert result is not None
-    assert initial_len == post_len
+    # Check that the tree didn't get mutated by get_child_node.
+    assert is_same_tree(tree, tree_copy)
 
 
 def test_no_existing_child_node() -> None:
@@ -139,14 +137,21 @@ def test_no_existing_child_node() -> None:
         ],
     }
 
-    initial_len = len(tree["children"])
-    result = get_child_node("childThree", "child/three", TestNodeTypeEnum.folder, tree)
-    post_len = len(tree["children"])
-    last_child = tree["children"][-1]
+    # Make a separate copy of tree["children"].
+    tree_before = tree.copy()
+    tree_before["children"] = tree["children"][:]
+
+    get_child_node("childThree", "child/three", TestNodeTypeEnum.folder, tree)
 
-    assert result is not None
+    tree_after = tree.copy()
+    tree_after["children"] = tree_after["children"][:-1]
+
+    # Check that all pre-existing items in the tree didn't get mutated by get_child_node.
+    assert is_same_tree(tree_before, tree_after)
+
+    # Check for the added node.
+    last_child = tree["children"][-1]
     assert last_child["name"] == "childThree"
-    assert initial_len < post_len
 
 
 def test_build_simple_tree() -> None:
diff --git a/pythonFiles/unittestadapter/discovery.py b/pythonFiles/unittestadapter/discovery.py
index 224c6fda6eea..46259c9e557a 100644
--- a/pythonFiles/unittestadapter/discovery.py
+++ b/pythonFiles/unittestadapter/discovery.py
@@ -2,7 +2,6 @@
 # Licensed under the MIT License.
 
 import argparse
-import enum
 import getopt
 import os
 import sys
@@ -22,12 +21,10 @@
 
 import httpx
 
-Arguments = Tuple[str, Any]
+DEFAULT_PORT = "45454"
 
-DEFAULT_PORT = 45454
 
-
-def parse_port(args: List[Arguments]) -> int:
+def parse_port(args: List[str]) -> int:
     """Parse command-line arguments that should be processed by the script.
 
     So far that only includes the port number that it needs to connect to.
@@ -35,7 +32,11 @@ def parse_port(args: List[Arguments]) -> int:
     defaults to DEFAULT_PORT if it can't be parsed.
     If there are several --port arguments, the value returned by parse_port will be the value of the last --port argument.
     """
-    return dict(args).get("--port", DEFAULT_PORT)
+    arg_parser = argparse.ArgumentParser()
+    arg_parser.add_argument("--port", default=DEFAULT_PORT)
+    parsed_args, _ = arg_parser.parse_known_args(args)
+
+    return int(parsed_args.port)
 
 
 def parse_unittest_args(args: List[str]) -> Tuple[str, str, Union[str, None]]:
@@ -131,11 +132,10 @@ def discover_tests(
     argv = sys.argv[1:]
     index = argv.index("--udiscovery")
 
-    script_args, _ = getopt.getopt(argv[:index], "", ["port="])
     start_dir, pattern, top_level_dir = parse_unittest_args(argv[index + 1 :])
 
     # Perform test discovery & send it over.
     payload = discover_tests(start_dir, pattern, top_level_dir)
 
-    port = parse_port(script_args)
+    port = parse_port(argv[:index])
     httpx.post(f"http://localhost:{port}", data=payload)  # type: ignore
diff --git a/pythonFiles/unittestadapter/utils.py b/pythonFiles/unittestadapter/utils.py
index ea43fb43e410..5ee7230e33db 100644
--- a/pythonFiles/unittestadapter/utils.py
+++ b/pythonFiles/unittestadapter/utils.py
@@ -6,7 +6,6 @@
 import os
 import pathlib
 import unittest
-
 from typing import List, Tuple, TypedDict, Union
 
 # Types

From c18592ff7ac78a1dd419be09c411772dd40301b8 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Fri, 14 Jan 2022 16:20:00 -0800
Subject: [PATCH 56/87] jk forgot about pathlib /

---
 pythonFiles/tests/unittestadapter/helpers.py        | 2 +-
 pythonFiles/tests/unittestadapter/test_discovery.py | 7 ++++---
 pythonFiles/tests/unittestadapter/test_utils.py     | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pythonFiles/tests/unittestadapter/helpers.py b/pythonFiles/tests/unittestadapter/helpers.py
index 346f142ff81e..303d021368f7 100644
--- a/pythonFiles/tests/unittestadapter/helpers.py
+++ b/pythonFiles/tests/unittestadapter/helpers.py
@@ -3,7 +3,7 @@
 
 import pathlib
 
-TEST_DATA_PATH = pathlib.Path(pathlib.Path(__file__).parent, ".data")
+TEST_DATA_PATH = pathlib.Path(__file__).parent / ".data"
 
 
 def is_same_tree(tree1, tree2) -> bool:
diff --git a/pythonFiles/tests/unittestadapter/test_discovery.py b/pythonFiles/tests/unittestadapter/test_discovery.py
index 36eb91c68fe2..4d9494d6f825 100644
--- a/pythonFiles/tests/unittestadapter/test_discovery.py
+++ b/pythonFiles/tests/unittestadapter/test_discovery.py
@@ -74,7 +74,7 @@ def test_simple_discovery() -> None:
     """
     start_dir = os.fsdecode(TEST_DATA_PATH)
     pattern = "discovery_simple*"
-    file_path = os.fsdecode(pathlib.PurePath(TEST_DATA_PATH, "discovery_simple.py"))
+    file_path = os.fsdecode(pathlib.PurePath(TEST_DATA_PATH / "discovery_simple.py"))
 
     expected = {
         "path": start_dir,
@@ -138,10 +138,11 @@ def test_error_discovery() -> None:
     if unittest discovery failed at some point.
     """
     # Discover tests in .data/discovery_error/.
-    start_dir = os.fsdecode(pathlib.PurePath(TEST_DATA_PATH, "discovery_error"))
+    start_path = pathlib.PurePath(TEST_DATA_PATH / "discovery_error")
+    start_dir = os.fsdecode(start_path)
     pattern = "file*"
 
-    file_path = os.fsdecode(pathlib.PurePath(start_dir, "file_two.py"))
+    file_path = os.fsdecode(start_path / "file_two.py")
 
     expected = {
         "path": start_dir,
diff --git a/pythonFiles/tests/unittestadapter/test_utils.py b/pythonFiles/tests/unittestadapter/test_utils.py
index e9eb5035bebe..cb541c486e1b 100644
--- a/pythonFiles/tests/unittestadapter/test_utils.py
+++ b/pythonFiles/tests/unittestadapter/test_utils.py
@@ -46,7 +46,7 @@ def test_simple_test_cases(directory, pattern, expected) -> None:
     actual = []
 
     # Discover tests in .data/<directory>.
-    start_dir = os.fsdecode(pathlib.PurePath(TEST_DATA_PATH, directory))
+    start_dir = os.fsdecode(TEST_DATA_PATH / directory)
 
     loader = unittest.TestLoader()
     suite = loader.discover(start_dir, pattern)

From 13fec9907e4d05093810b5ebb0840f3742353516 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Tue, 18 Jan 2022 15:51:53 -0800
Subject: [PATCH 57/87] Use a homemade socket instead of httpx

---
 pythonFiles/testing_tools/socket_manager.py | 30 +++++++++++++
 pythonFiles/unittestadapter/discovery.py    | 36 ++++++++++------
 requirements.in                             |  1 -
 requirements.txt                            | 47 +--------------------
 4 files changed, 55 insertions(+), 59 deletions(-)
 create mode 100644 pythonFiles/testing_tools/socket_manager.py

diff --git a/pythonFiles/testing_tools/socket_manager.py b/pythonFiles/testing_tools/socket_manager.py
new file mode 100644
index 000000000000..c32c70d780c7
--- /dev/null
+++ b/pythonFiles/testing_tools/socket_manager.py
@@ -0,0 +1,30 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+import socket
+import sys
+
+
+class SocketManager(object):
+    def __init__(self, addr):
+        self.socket = None
+        self.addr = addr
+
+    def __enter__(self):
+        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM, socket.IPPROTO_TCP)
+        if sys.platform == "win32":
+            sock.setsockopt(socket.SOL_SOCKET, socket.SO_EXCLUSIVEADDRUSE, 1)
+        else:
+            sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+        self.socket = sock
+        sock.connect(self.addr)
+
+        return self
+
+    def __exit__(self, type, value, tb):
+        if self.socket:
+            try:
+                self.socket.shutdown(socket.SHUT_RDWR)
+            except Exception:
+                pass
+            self.socket.close()
diff --git a/pythonFiles/unittestadapter/discovery.py b/pythonFiles/unittestadapter/discovery.py
index 46259c9e557a..1f65ba076bc9 100644
--- a/pythonFiles/unittestadapter/discovery.py
+++ b/pythonFiles/unittestadapter/discovery.py
@@ -2,24 +2,25 @@
 # Licensed under the MIT License.
 
 import argparse
-import getopt
+import json
 import os
 import sys
 import traceback
 import unittest
-from typing import Any, List, Literal, Optional, Tuple, TypedDict, Union
+from typing import List, Literal, Optional, Tuple, TypedDict, Union
 
-from typing_extensions import NotRequired
+from utils import TestNode, build_test_tree
+
+# Add the path to pythonFiles to sys.path to find testing_tools.socket_manager.
+PYTHON_FILES = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+sys.path.insert(0, PYTHON_FILES)
 
-from .utils import TestNode, build_test_tree
+from testing_tools import socket_manager
 
-# Add the lib path to our sys path to find the httpx module.
-EXTENSION_ROOT = os.path.dirname(
-    os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-)
-sys.path.insert(0, os.path.join(EXTENSION_ROOT, "pythonFiles", "lib", "python"))
+# Add the lib path to sys.path to find the typing_extensions module.
+sys.path.insert(0, os.path.join(PYTHON_FILES, "lib", "python"))
 
-import httpx
+from typing_extensions import NotRequired
 
 DEFAULT_PORT = "45454"
 
@@ -134,8 +135,19 @@ def discover_tests(
 
     start_dir, pattern, top_level_dir = parse_unittest_args(argv[index + 1 :])
 
-    # Perform test discovery & send it over.
+    # Perform test discovery.
     payload = discover_tests(start_dir, pattern, top_level_dir)
 
     port = parse_port(argv[:index])
-    httpx.post(f"http://localhost:{port}", data=payload)  # type: ignore
+    addr = ('localhost', port)
+
+    # Build the request data (it has to be a POST request or the Node side will not process it), and send it.
+    with socket_manager.SocketManager(addr) as s:
+        data = json.dumps(payload)
+        request = f"""POST / HTTP/1.1
+Host: localhost:{port}
+Content-Length: {len(data)}
+Content-Type: application/json
+
+{data}"""
+        result = s.socket.sendall(request.encode("utf-8")) # type: ignore
diff --git a/requirements.in b/requirements.in
index dc09b9a1ffa5..5dbf1a00280c 100644
--- a/requirements.in
+++ b/requirements.in
@@ -5,7 +5,6 @@
 
 # Unittest test adapter
 typing-extensions==4.0.1
-httpx==0.21.3
 
 # Sort Imports
 isort==5.10.0
diff --git a/requirements.txt b/requirements.txt
index 6dc61d3de585..4016191f84d3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,56 +4,11 @@
 #
 #    pip-compile --generate-hashes requirements.in
 #
-anyio==3.4.0 \
-    --hash=sha256:24adc69309fb5779bc1e06158e143e0b6d2c56b302a3ac3de3083c705a6ed39d \
-    --hash=sha256:2855a9423524abcdd652d942f8932fda1735210f77a6b392eafd9ff34d3fe020
-    # via httpcore
-certifi==2021.10.8 \
-    --hash=sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872 \
-    --hash=sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569
-    # via
-    #   httpcore
-    #   httpx
-charset-normalizer==2.0.9 \
-    --hash=sha256:1eecaa09422db5be9e29d7fc65664e6c33bd06f9ced7838578ba40d58bdf3721 \
-    --hash=sha256:b0b883e8e874edfdece9c28f314e3dd5badf067342e42fb162203335ae61aa2c
-    # via httpx
-h11==0.12.0 \
-    --hash=sha256:36a3cb8c0a032f56e2da7084577878a035d3b61d104230d4bd49c0c6b555a9c6 \
-    --hash=sha256:47222cb6067e4a307d535814917cd98fd0a57b6788ce715755fa2b6c28b56042
-    # via httpcore
-httpcore==0.14.4 \
-    --hash=sha256:9410fe352bea732311f2b2bee0555c8cc5e62b9a73b9d3272fe125a2aa6eb28e \
-    --hash=sha256:d4305811f604d3c2e22869147392f134796976ff946c96a8cfba87f4e0171d83
-    # via httpx
-httpx==0.21.3 \
-    --hash=sha256:7a3eb67ef0b8abbd6d9402248ef2f84a76080fa1c839f8662e6eb385640e445a \
-    --hash=sha256:df9a0fd43fa79dbab411d83eb1ea6f7a525c96ad92e60c2d7f40388971b25777
-    # via -r requirements.in
-idna==3.3 \
-    --hash=sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff \
-    --hash=sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d
-    # via
-    #   anyio
-    #   rfc3986
 isort==5.10.0 \
     --hash=sha256:1a18ccace2ed8910bd9458b74a3ecbafd7b2f581301b0ab65cfdd4338272d76f \
     --hash=sha256:e52ff6d38012b131628cf0f26c51e7bd3a7c81592eefe3ac71411e692f1b9345
     # via -r requirements.in
-rfc3986[idna2008]==1.5.0 \
-    --hash=sha256:270aaf10d87d0d4e095063c65bf3ddbc6ee3d0b226328ce21e036f946e421835 \
-    --hash=sha256:a86d6e1f5b1dc238b218b012df0aa79409667bb209e58da56d0b94704e712a97
-    # via httpx
-sniffio==1.2.0 \
-    --hash=sha256:471b71698eac1c2112a40ce2752bb2f4a4814c22a54a3eed3676bc0f5ca9f663 \
-    --hash=sha256:c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de
-    # via
-    #   anyio
-    #   httpcore
-    #   httpx
 typing-extensions==4.0.1 \
     --hash=sha256:4ca091dea149f945ec56afb48dae714f21e8692ef22a395223bcd328961b6a0e \
     --hash=sha256:7f001e5ac290a0c0401508864c7ec868be4e701886d5b573a9528ed3973d9d3b
-    # via
-    #   -r requirements.in
-    #   anyio
+    # via -r requirements.in

From de4b6558f9694a6e97620c33129047d02856158b Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Tue, 18 Jan 2022 15:52:14 -0800
Subject: [PATCH 58/87] Make tests as todo

---
 .../testing/testController/workspaceTestAdapter.unit.test.ts  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/testing/testController/workspaceTestAdapter.unit.test.ts b/src/test/testing/testController/workspaceTestAdapter.unit.test.ts
index 11cb20f2e107..224406d8f397 100644
--- a/src/test/testing/testController/workspaceTestAdapter.unit.test.ts
+++ b/src/test/testing/testController/workspaceTestAdapter.unit.test.ts
@@ -37,7 +37,7 @@ suite('Workspace test adapter', () => {
                 }),
             } as unknown) as IConfigurationService;
 
-            // For some reason the 'tests' namespace in the proposed API is not reachable.
+            // For some reason the 'tests' namespace in vscode returns undefined.
             // While I figure out how to expose to the tests, they will run
             // against a stub test controller and stub test items.
             const testItem = ({
@@ -185,7 +185,7 @@ suite('Workspace test adapter', () => {
         });
 
         /**
-         * To test:
+         * TODO To test:
          * - successful discovery but no data: delete everything from the test controller
          * - successful discovery with error status: add error node to tree
          * - single root: populate tree if there's no root node

From 80205a2caa80b5e1c9e61800b071b03ae3c6b183 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Tue, 18 Jan 2022 15:55:30 -0800
Subject: [PATCH 59/87] Sort Python imports on save

---
 .vscode/settings.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 612f4083a3db..d818d30862a2 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -23,7 +23,10 @@
         ".vscode test": true
     },
     "[python]": {
-        "editor.formatOnSave": true
+        "editor.formatOnSave": true,
+        "editor.codeActionsOnSave": {
+            "source.organizeImports": true
+        }
     },
     "[typescript]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode",

From 22521165d38f491adc9f032446f00a963519fb1e Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Wed, 19 Jan 2022 13:02:49 -0800
Subject: [PATCH 60/87] WIP new always-alive server

---
 .../tests/unittestadapter/test_discovery.py   | 22 ++---
 pythonFiles/unittestadapter/discovery.py      | 23 ++---
 src/client/testing/common/types.ts            |  4 -
 .../testController/common/commandRunner.ts    |  7 +-
 .../testing/testController/common/server.ts   | 90 ++++++++++++++++++
 .../testing/testController/common/types.ts    | 91 +++++++++++--------
 .../testing/testController/controller.ts      | 53 ++++++-----
 .../unittest/testDiscoveryAdapter.ts          | 71 ++++++++++-----
 .../testController/workspaceTestAdapter.ts    | 25 +++--
 9 files changed, 262 insertions(+), 124 deletions(-)
 create mode 100644 src/client/testing/testController/common/server.ts

diff --git a/pythonFiles/tests/unittestadapter/test_discovery.py b/pythonFiles/tests/unittestadapter/test_discovery.py
index 4d9494d6f825..db3ce9079c8d 100644
--- a/pythonFiles/tests/unittestadapter/test_discovery.py
+++ b/pythonFiles/tests/unittestadapter/test_discovery.py
@@ -5,12 +5,8 @@
 import pathlib
 
 import pytest
-from unittestadapter.discovery import (
-    DEFAULT_PORT,
-    discover_tests,
-    parse_port,
-    parse_unittest_args,
-)
+from unittestadapter.discovery import (DEFAULT_PORT, discover_tests,
+                                       parse_cli_args, parse_unittest_args)
 from unittestadapter.utils import TestNodeTypeEnum
 
 from .helpers import TEST_DATA_PATH, is_same_tree
@@ -24,15 +20,15 @@
         (["--port", "4444", "--foo", "something", "--port", "9999"], 9999),
     ],
 )
-def test_parse_port_option(args, expected) -> None:
-    """The parse_port function should parse and return the port passed as a command-line option.
+def test_parse_cli_args(args, expected) -> None:
+    """The parse_cli_args function should parse and return the port passed as a command-line option.
 
     If there was no --port command-line option, it should return the default port value.
     If there are multiple --port options, the last one wins.
     """
-    actual = parse_port(args)
+    port, _ = parse_cli_args(args)
 
-    assert expected == actual
+    assert expected == port
 
 
 @pytest.mark.parametrize(
@@ -112,7 +108,7 @@ def test_simple_discovery() -> None:
         ],
     }
 
-    actual = discover_tests(start_dir, pattern, None)
+    actual = discover_tests(start_dir, pattern, None, None)
 
     assert actual["status"] == "success"
     assert is_same_tree(actual.get("tests"), expected)
@@ -126,7 +122,7 @@ def test_empty_discovery() -> None:
     start_dir = os.fsdecode(TEST_DATA_PATH)
     pattern = "discovery_empty*"
 
-    actual = discover_tests(start_dir, pattern, None)
+    actual = discover_tests(start_dir, pattern, None, None)
 
     assert actual["status"] == "success"
     assert "tests" not in actual
@@ -180,7 +176,7 @@ def test_error_discovery() -> None:
         ],
     }
 
-    actual = discover_tests(start_dir, pattern, None)
+    actual = discover_tests(start_dir, pattern, None, None)
 
     assert actual["status"] == "error"
     assert is_same_tree(expected, actual.get("tests"))
diff --git a/pythonFiles/unittestadapter/discovery.py b/pythonFiles/unittestadapter/discovery.py
index 1f65ba076bc9..f9194d15c42d 100644
--- a/pythonFiles/unittestadapter/discovery.py
+++ b/pythonFiles/unittestadapter/discovery.py
@@ -25,20 +25,21 @@
 DEFAULT_PORT = "45454"
 
 
-def parse_port(args: List[str]) -> int:
+def parse_cli_args(args: List[str]) -> Tuple[int, Union[str, None]]:
     """Parse command-line arguments that should be processed by the script.
 
-    So far that only includes the port number that it needs to connect to.
+    So far this includes the port number that it needs to connect to, and the uuid passed by the TS side.
     The port is passed to the discovery.py script when it is executed, and
     defaults to DEFAULT_PORT if it can't be parsed.
-    If there are several --port arguments, the value returned by parse_port will be the value of the last --port argument.
+    The uuid should be passed to the discovery.py script when it is executed, and defaults to None if it can't be parsed.
+    If the arguments appear several times, the value returned by parse_cli_args will be the value of the last argument.
     """
     arg_parser = argparse.ArgumentParser()
     arg_parser.add_argument("--port", default=DEFAULT_PORT)
+    arg_parser.add_argument("--uuid")
     parsed_args, _ = arg_parser.parse_known_args(args)
 
-    return int(parsed_args.port)
-
+    return int(parsed_args.port), parsed_args.uuid
 
 def parse_unittest_args(args: List[str]) -> Tuple[str, str, Union[str, None]]:
     """Parse command-line arguments that should be forwarded to unittest.
@@ -68,13 +69,14 @@ def parse_unittest_args(args: List[str]) -> Tuple[str, str, Union[str, None]]:
 
 class PayloadDict(TypedDict):
     cwd: str
+    uuid: Union[str, None]
     status: Literal["success", "error"]
     tests: NotRequired[TestNode]
     errors: NotRequired[List[str]]
 
 
 def discover_tests(
-    start_dir: str, pattern: str, top_level_dir: Optional[str]
+    start_dir: str, pattern: str, top_level_dir: Optional[str], uuid: Optional[str]
 ) -> PayloadDict:
     """Returns a dictionary containing details of the discovered tests.
 
@@ -106,7 +108,7 @@ def discover_tests(
     }
     """
     cwd = os.path.abspath(start_dir)
-    payload: PayloadDict = {"cwd": cwd, "status": "success"}
+    payload: PayloadDict = {"cwd": cwd, "status": "success", "uuid": uuid}
     tests = None
     errors = []
 
@@ -136,12 +138,11 @@ def discover_tests(
     start_dir, pattern, top_level_dir = parse_unittest_args(argv[index + 1 :])
 
     # Perform test discovery.
-    payload = discover_tests(start_dir, pattern, top_level_dir)
-
-    port = parse_port(argv[:index])
-    addr = ('localhost', port)
+    port, uuid = parse_cli_args(argv[:index])
+    payload = discover_tests(start_dir, pattern, top_level_dir, uuid)
 
     # Build the request data (it has to be a POST request or the Node side will not process it), and send it.
+    addr = ('localhost', port)
     with socket_manager.SocketManager(addr) as s:
         data = json.dumps(payload)
         request = f"""POST / HTTP/1.1
diff --git a/src/client/testing/common/types.ts b/src/client/testing/common/types.ts
index a5f69971a3e2..b1476e74435f 100644
--- a/src/client/testing/common/types.ts
+++ b/src/client/testing/common/types.ts
@@ -8,10 +8,6 @@ export type UnitTestProduct = Product.pytest | Product.unittest;
 // ****************
 // test args/options
 
-export type TestCommandOptions = TestDiscoveryOptions & {
-    port: number;
-};
-
 export type TestDiscoveryOptions = {
     workspaceFolder: Uri;
     cwd: string;
diff --git a/src/client/testing/testController/common/commandRunner.ts b/src/client/testing/testController/common/commandRunner.ts
index 55653a8ed926..f03eed8964e3 100644
--- a/src/client/testing/testController/common/commandRunner.ts
+++ b/src/client/testing/testController/common/commandRunner.ts
@@ -7,7 +7,8 @@ import {
     SpawnOptions,
 } from '../../../common/process/types';
 import { createDeferred } from '../../../common/utils/async';
-import { TestCommandOptions } from '../../common/types';
+import { TestDiscoveryOptions } from '../../common/types';
+import { DEFAULT_TEST_PORT } from './utils';
 
 /**
  * Helper function that will communicate with a Python script via a "client/server" architecture.
@@ -17,7 +18,7 @@ import { TestCommandOptions } from '../../common/types';
  */
 export async function runTestCommand(
     executionFactory: IPythonExecutionFactory,
-    options: TestCommandOptions,
+    options: TestDiscoveryOptions,
 ): Promise<string> {
     const deferred = createDeferred<string>();
     let server: http.Server;
@@ -58,7 +59,7 @@ export async function runTestCommand(
     server = http.createServer(requestListener);
     server.maxConnections = 1;
 
-    server.listen(options.port, async () => {
+    server.listen(DEFAULT_TEST_PORT, async () => {
         if (options.outChannel) {
             options.outChannel.appendLine(`python ${options.args.join(' ')}`);
         }
diff --git a/src/client/testing/testController/common/server.ts b/src/client/testing/testController/common/server.ts
new file mode 100644
index 000000000000..e1140941c68e
--- /dev/null
+++ b/src/client/testing/testController/common/server.ts
@@ -0,0 +1,90 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import * as http from 'http';
+import { randomUUID } from 'crypto';
+import { Event, EventEmitter } from 'vscode';
+import {
+    ExecutionFactoryCreateWithEnvironmentOptions,
+    IPythonExecutionFactory,
+    SpawnOptions,
+} from '../../../common/process/types';
+import { DataReceivedEvent, ITestServer } from './types';
+import { TestDiscoveryOptions } from '../../common/types';
+
+export class PythonTestServer implements ITestServer {
+    private _onDataReceived: EventEmitter<DataReceivedEvent> = new EventEmitter<DataReceivedEvent>();
+
+    private uuids: string[];
+
+    private server: http.Server;
+
+    constructor(private executionFactory: IPythonExecutionFactory, readonly port: number) {
+        this.uuids = [];
+
+        const requestListener: http.RequestListener = async (request, response) => {
+            const buffers = [];
+
+            for await (const chunk of request) {
+                buffers.push(chunk);
+            }
+
+            const data = Buffer.concat(buffers).toString();
+
+            response.end();
+
+            const { uuid, cwd } = JSON.parse(data);
+
+            // Check if the uuid we received exists in the list of active ones.
+            // If yes, process the response, if not, ignore it.
+            const index = this.uuids.indexOf(uuid);
+            if (index !== -1) {
+                this._onDataReceived.fire({ cwd, data });
+                this.uuids.splice(index, 1);
+            }
+        };
+
+        this.server = http.createServer(requestListener);
+        this.server.listen(port);
+    }
+
+    public dispose(): void {
+        this.server.close();
+        this._onDataReceived.dispose();
+    }
+
+    public get onDataReceived(): Event<DataReceivedEvent> {
+        return this._onDataReceived.event;
+    }
+
+    async sendCommand(options: TestDiscoveryOptions): Promise<void> {
+        const uuid = randomUUID();
+        this.uuids.push(uuid);
+
+        const spawnOptions: SpawnOptions = {
+            token: options.token,
+            cwd: options.cwd,
+            throwOnStdErr: true,
+        };
+
+        // Create the Python environment in which to execute the command.
+        const creationOptions: ExecutionFactoryCreateWithEnvironmentOptions = {
+            allowEnvironmentFetchExceptions: false,
+            resource: options.workspaceFolder,
+        };
+        const execService = await this.executionFactory.createActivatedEnvironment(creationOptions);
+
+        // Append the generated UUID to the data to be sent (expecting to receive it back).
+        const args = options.args.concat('--uuid', uuid);
+
+        if (options.outChannel) {
+            options.outChannel.appendLine(`python ${args.join(' ')}`);
+        }
+
+        try {
+            await execService.exec(args, spawnOptions);
+        } catch (ex) {
+            // No catch statement.
+        }
+    }
+}
diff --git a/src/client/testing/testController/common/types.ts b/src/client/testing/testController/common/types.ts
index bd1f3128e275..8e67b14c375c 100644
--- a/src/client/testing/testController/common/types.ts
+++ b/src/client/testing/testController/common/types.ts
@@ -11,7 +11,7 @@ import {
     Uri,
     WorkspaceFolder,
 } from 'vscode';
-import { IPythonExecutionFactory } from '../../../common/process/types';
+// import { IPythonExecutionFactory } from '../../../common/process/types';
 import { IConfigurationService } from '../../../common/types';
 import { TestDiscoveryOptions } from '../../common/types';
 
@@ -88,42 +88,6 @@ export type TestRunOptions = {
     token: CancellationToken;
 };
 
-export interface ITestDiscoveryAdapter {
-    executionFactory: IPythonExecutionFactory;
-    configSettings: IConfigurationService;
-    port: number;
-    discoverTests(uri: Uri): Promise<DiscoveredTestPayload>;
-}
-
-// New test discovery adapter types
-
-// Same types as in pythonFiles/unittestadapter/utils.py
-// Trailing underscore to avoid collision with the 'types' Python keyword.
-export type DiscoveredTestType = 'folder' | 'file' | 'class' | 'test';
-
-export type DiscoveredTestCommon = {
-    path: string;
-    name: string;
-    type_: DiscoveredTestType;
-};
-
-export type DiscoveredTestItem = DiscoveredTestCommon & {
-    lineno: number;
-    // Trailing underscore to avoid collision with the 'id' Python keyword.
-    id_: string;
-};
-
-export type DiscoveredTestNode = DiscoveredTestCommon & {
-    children: (DiscoveredTestNode | DiscoveredTestItem)[];
-};
-
-export type DiscoveredTestPayload = {
-    cwd: string;
-    tests?: DiscoveredTestNode;
-    status: 'success' | 'error';
-    errors?: string[];
-};
-
 // We expose these here as a convenience and to cut down on churn
 // elsewhere in the code.
 type RawTestNode = {
@@ -160,3 +124,56 @@ export type RawDiscoveredTests = {
     parents: RawTestParent[];
     tests: RawTest[];
 };
+
+// New test discovery adapter types
+
+export type DataReceivedEvent = {
+    cwd: string;
+    data: string;
+};
+
+/**
+ * Interface describing the server that will send test commands to the Python side, and process responses.
+ *
+ * Consumers will call sendCommand in order to execute Python-related code,
+ * and will subscribe to the onDataReceived event to wait for the results.
+ */
+export interface ITestServer {
+    readonly onDataReceived: Event<DataReceivedEvent>;
+    readonly port: number;
+    sendCommand(options: TestDiscoveryOptions): Promise<void>;
+}
+
+export interface ITestDiscoveryAdapter {
+    // executionFactory: IPythonExecutionFactory;
+    configSettings: IConfigurationService;
+    // port: number;
+    discoverTests(uri: Uri): Promise<DiscoveredTestPayload>;
+}
+
+// Same types as in pythonFiles/unittestadapter/utils.py
+export type DiscoveredTestType = 'folder' | 'file' | 'class' | 'test';
+
+export type DiscoveredTestCommon = {
+    path: string;
+    name: string;
+    // Trailing underscore to avoid collision with the 'type' Python keyword.
+    type_: DiscoveredTestType;
+};
+
+export type DiscoveredTestItem = DiscoveredTestCommon & {
+    lineno: number;
+    // Trailing underscore to avoid collision with the 'id' Python keyword.
+    id_: string;
+};
+
+export type DiscoveredTestNode = DiscoveredTestCommon & {
+    children: (DiscoveredTestNode | DiscoveredTestItem)[];
+};
+
+export type DiscoveredTestPayload = {
+    cwd: string;
+    tests?: DiscoveredTestNode;
+    status: 'success' | 'error';
+    errors?: string[];
+};
diff --git a/src/client/testing/testController/controller.ts b/src/client/testing/testController/controller.ts
index cd03d86d2e7e..15b40b6d5720 100644
--- a/src/client/testing/testController/controller.ts
+++ b/src/client/testing/testController/controller.ts
@@ -25,8 +25,10 @@ import { traceVerbose } from '../../logging';
 import { sendTelemetryEvent } from '../../telemetry';
 import { EventName } from '../../telemetry/constants';
 import { PYTEST_PROVIDER, UNITTEST_PROVIDER } from '../common/constants';
+import { PythonTestServer } from './common/server';
 import { DebugTestTag, getNodeByUri, RunTestTag } from './common/testItemUtilities';
 import { ITestController, ITestFrameworkController, TestRefreshOptions } from './common/types';
+import { DEFAULT_TEST_PORT } from './common/utils';
 import { WorkspaceTestAdapter } from './workspaceTestAdapter';
 
 @injectable()
@@ -49,6 +51,8 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
         WorkspaceFolder[]
     >();
 
+    private pythonTestServer: PythonTestServer;
+
     public readonly onRefreshingCompleted = this.refreshingCompletedEvent.event;
 
     public readonly onRefreshingStarted = this.refreshingStartedEvent.event;
@@ -98,10 +102,33 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
             ),
         );
         this.testController.resolveHandler = this.resolveChildren.bind(this);
+
+        this.pythonTestServer = new PythonTestServer(this.pythonExecFactory, DEFAULT_TEST_PORT);
     }
 
     public async activate(): Promise<void> {
-        this.watchForTestChanges();
+        const workspaces: readonly WorkspaceFolder[] = this.workspaceService.workspaceFolders || [];
+        for (let i = 0; i < workspaces.length; i += 1) {
+            const workspace = workspaces[i];
+            console.warn(`instantiating test adapters - workspace name: ${workspace.name}`);
+            const settings = this.configSettings.getSettings(workspace.uri);
+            const workspaceTestAdapter = new WorkspaceTestAdapter(
+                'unittest',
+                workspace.uri,
+                // i,
+                // this.pythonExecFactory,
+                this.configSettings,
+                this.pythonTestServer,
+            );
+
+            this.testAdapters.set(workspace.uri, workspaceTestAdapter);
+
+            if (settings.testing.autoTestDiscoverOnSaveEnabled) {
+                traceVerbose(`Testing: Setting up watcher for ${workspace.uri.fsPath}`);
+                this.watchForSettingsChanges(workspace);
+                this.watchForTestContentChanges(workspace);
+            }
+        }
     }
 
     public refreshTestData(uri?: Resource, options?: TestRefreshOptions): Promise<void> {
@@ -295,30 +322,6 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
         });
     }
 
-    private watchForTestChanges(): void {
-        const workspaces: readonly WorkspaceFolder[] = this.workspaceService.workspaceFolders || [];
-        for (let i = 0; i < workspaces.length; i += 1) {
-            const workspace = workspaces[i];
-            console.warn(`instantiating test adapters - workspace name: ${workspace.name}`);
-            const settings = this.configSettings.getSettings(workspace.uri);
-            const workspaceTestAdapter = new WorkspaceTestAdapter(
-                'unittest',
-                workspace.uri,
-                i,
-                this.pythonExecFactory,
-                this.configSettings,
-            );
-
-            this.testAdapters.set(workspace.uri, workspaceTestAdapter);
-
-            if (settings.testing.autoTestDiscoverOnSaveEnabled) {
-                traceVerbose(`Testing: Setting up watcher for ${workspace.uri.fsPath}`);
-                this.watchForSettingsChanges(workspace);
-                this.watchForTestContentChanges(workspace);
-            }
-        }
-    }
-
     private watchForSettingsChanges(workspace: WorkspaceFolder): void {
         const pattern = new RelativePattern(workspace, '**/{settings.json,pytest.ini,pyproject.toml,setup.cfg}');
         const watcher = this.workspaceService.createFileSystemWatcher(pattern);
diff --git a/src/client/testing/testController/unittest/testDiscoveryAdapter.ts b/src/client/testing/testController/unittest/testDiscoveryAdapter.ts
index 6f8129f932d9..5fc3b8bb3b5e 100644
--- a/src/client/testing/testController/unittest/testDiscoveryAdapter.ts
+++ b/src/client/testing/testController/unittest/testDiscoveryAdapter.ts
@@ -3,45 +3,72 @@
 
 import * as path from 'path';
 import { Uri } from 'vscode';
-import { IPythonExecutionFactory } from '../../../common/process/types';
+// import { IPythonExecutionFactory } from '../../../common/process/types';
 import { IConfigurationService } from '../../../common/types';
+import { createDeferred, Deferred } from '../../../common/utils/async';
 import { EXTENSION_ROOT_DIR } from '../../../constants';
-import { TestCommandOptions } from '../../common/types';
-import { runTestCommand } from '../common/commandRunner';
-import { DiscoveredTestPayload, ITestDiscoveryAdapter } from '../common/types';
+import { TestDiscoveryOptions } from '../../common/types';
+// import { runTestCommand } from '../common/commandRunner';
+import { DataReceivedEvent, DiscoveredTestPayload, ITestDiscoveryAdapter, ITestServer } from '../common/types';
 
 /**
  * Wrapper class for unittest test discovery. This is where we call `runTestCommand`.
  */
 export class UnittestTestDiscoveryAdapter implements ITestDiscoveryAdapter {
+    private deferred: Deferred<DiscoveredTestPayload> | undefined;
+
+    private cwd: string | undefined;
+
     constructor(
-        public executionFactory: IPythonExecutionFactory,
-        public configSettings: IConfigurationService,
-        public port: number,
-    ) {}
+        public testServer: ITestServer,
+        // public executionFactory: IPythonExecutionFactory,
+        public configSettings: IConfigurationService, // public port: number,
+    ) {
+        testServer.onDataReceived(this.onDataReceivedHandler);
+    }
+
+    public onDataReceivedHandler({ cwd, data }: DataReceivedEvent): void {
+        if (this.deferred && cwd === this.cwd) {
+            const testData: DiscoveredTestPayload = JSON.parse(data);
+
+            this.deferred.resolve(testData);
+            this.deferred = undefined;
+        }
+    }
 
     public async discoverTests(uri: Uri): Promise<DiscoveredTestPayload> {
-        const settings = this.configSettings.getSettings(uri);
-        const { unittestArgs } = settings.testing;
+        if (!this.deferred) {
+            const settings = this.configSettings.getSettings(uri);
+            const { unittestArgs } = settings.testing;
+
+            const command = this.buildDiscoveryCommand(unittestArgs);
+
+            this.cwd = uri.fsPath;
+
+            const options: TestDiscoveryOptions = {
+                workspaceFolder: uri,
+                // port: this.port,
+                args: command,
+                cwd: this.cwd,
+                ignoreCache: false,
+            };
 
-        const command = this.buildDiscoveryCommand(unittestArgs);
+            this.deferred = createDeferred<DiscoveredTestPayload>();
 
-        const options: TestCommandOptions = {
-            workspaceFolder: uri,
-            port: this.port,
-            args: command,
-            cwd: uri.fsPath,
-            ignoreCache: false,
-        };
+            // Send the test command to the server.
+            // The server will fire an onDataReceived event once it gets a response.
+            this.testServer.sendCommand(options);
+        }
 
-        const result = await runTestCommand(this.executionFactory, options);
-        const testData = JSON.parse(result);
+        return this.deferred.promise;
+        // const result = await runTestCommand(this.executionFactory, options);
+        // const testData = JSON.parse(result);
 
-        return Promise.resolve(testData);
+        // return Promise.resolve(testData);
     }
 
     private buildDiscoveryCommand(args: string[]): string[] {
         const discoveryScript = path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'unittestadapter', 'discovery.py');
-        return [discoveryScript, '--port', `${this.port}`, '--udiscovery', ...args];
+        return [discoveryScript, '--port', `${this.testServer.port}`, '--udiscovery', ...args];
     }
 }
diff --git a/src/client/testing/testController/workspaceTestAdapter.ts b/src/client/testing/testController/workspaceTestAdapter.ts
index 1024a92ad85d..e2ddf0a26462 100644
--- a/src/client/testing/testController/workspaceTestAdapter.ts
+++ b/src/client/testing/testController/workspaceTestAdapter.ts
@@ -4,7 +4,7 @@
 import * as path from 'path';
 import * as util from 'util';
 import { CancellationToken, Position, Range, TestController, TestItem, Uri } from 'vscode';
-import { IPythonExecutionFactory } from '../../common/process/types';
+// import { IPythonExecutionFactory } from '../../common/process/types';
 import { IConfigurationService } from '../../common/types';
 import { createDeferred, Deferred } from '../../common/utils/async';
 import { Testing } from '../../common/utils/localize';
@@ -13,8 +13,14 @@ import { sendTelemetryEvent } from '../../telemetry';
 import { EventName } from '../../telemetry/constants';
 import { TestProvider } from '../types';
 import { createErrorTestItem, DebugTestTag, ErrorTestItemOptions, RunTestTag } from './common/testItemUtilities';
-import { DiscoveredTestItem, DiscoveredTestNode, DiscoveredTestType, ITestDiscoveryAdapter } from './common/types';
-import { DEFAULT_TEST_PORT } from './common/utils';
+import {
+    DiscoveredTestItem,
+    DiscoveredTestNode,
+    DiscoveredTestType,
+    ITestDiscoveryAdapter,
+    ITestServer,
+} from './common/types';
+// import { DEFAULT_TEST_PORT } from './common/utils';
 import { UnittestTestDiscoveryAdapter } from './unittest/testDiscoveryAdapter';
 
 /**
@@ -23,7 +29,7 @@ import { UnittestTestDiscoveryAdapter } from './unittest/testDiscoveryAdapter';
  * It gets instantiated by the `PythonTestController` class in charge of reflecting test data in the UI,
  * and then instantiates provider-specific adapters under the hood depending on settings.
  *
- * This class formats the JSON test data returned by the `UnittestTestDiscoveryAdapter` into test UI elements,
+ * This class formats the JSON test data returned by the `[Unittest|Pytest]TestDiscoveryAdapter` into test UI elements,
  * and uses them to insert/update/remove items in the `TestController` instance behind the testing UI whenever the `PythonTestController` requests a refresh.
  */
 export class WorkspaceTestAdapter {
@@ -39,18 +45,19 @@ export class WorkspaceTestAdapter {
     constructor(
         private testProvider: TestProvider,
         private workspaceUri: Uri,
-        index: number,
-        executionFactory: IPythonExecutionFactory,
+        // index: number,
+        // executionFactory: IPythonExecutionFactory,
         configSettings: IConfigurationService,
+        testServer: ITestServer,
     ) {
         if (this.testProvider === 'unittest') {
-            const port = DEFAULT_TEST_PORT + index * 10;
+            // const port = DEFAULT_TEST_PORT + index * 10;
 
-            this.discoveryAdapter = new UnittestTestDiscoveryAdapter(executionFactory, configSettings, port);
+            this.discoveryAdapter = new UnittestTestDiscoveryAdapter(testServer, configSettings);
         } else {
             // TODO: PYTEST DISCOVERY ADAPTER
             // this is a placeholder for now
-            this.discoveryAdapter = new UnittestTestDiscoveryAdapter(executionFactory, configSettings, 45454);
+            this.discoveryAdapter = new UnittestTestDiscoveryAdapter(testServer, configSettings);
         }
     }
 

From 70cee6acc2879a69fbd2e82d1ea5ae058c460e94 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Wed, 19 Jan 2022 14:29:01 -0800
Subject: [PATCH 61/87] Get new server architecture up

---
 pythonFiles/unittestadapter/utils.py          |   3 +-
 .../testController/common/commandRunner.ts    |  77 ----------
 .../testing/testController/common/server.ts   |  29 ++--
 .../testing/testController/common/types.ts    |  17 ++-
 .../unittest/testDiscoveryAdapter.ts          |  44 +++---
 .../testController/workspaceTestAdapter.ts    |   1 -
 .../testController/commandRunner.unit.test.ts | 135 ------------------
 7 files changed, 53 insertions(+), 253 deletions(-)
 delete mode 100644 src/client/testing/testController/common/commandRunner.ts
 delete mode 100644 src/test/testing/testController/commandRunner.unit.test.ts

diff --git a/pythonFiles/unittestadapter/utils.py b/pythonFiles/unittestadapter/utils.py
index 5ee7230e33db..ad6b705e702f 100644
--- a/pythonFiles/unittestadapter/utils.py
+++ b/pythonFiles/unittestadapter/utils.py
@@ -11,7 +11,8 @@
 # Types
 
 
-class TestNodeTypeEnum(enum.Enum):
+# Inherit from str so it's JSON serializable.
+class TestNodeTypeEnum(str, enum.Enum):
     class_ = "class"
     file = "file"
     folder = "folder"
diff --git a/src/client/testing/testController/common/commandRunner.ts b/src/client/testing/testController/common/commandRunner.ts
deleted file mode 100644
index f03eed8964e3..000000000000
--- a/src/client/testing/testController/common/commandRunner.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-import * as http from 'http';
-import {
-    ExecutionFactoryCreateWithEnvironmentOptions,
-    IPythonExecutionFactory,
-    SpawnOptions,
-} from '../../../common/process/types';
-import { createDeferred } from '../../../common/utils/async';
-import { TestDiscoveryOptions } from '../../common/types';
-import { DEFAULT_TEST_PORT } from './utils';
-
-/**
- * Helper function that will communicate with a Python script via a "client/server" architecture.
- * The TS side will send a command to a Python script, and spawn a server that will listen for a reply from the Python side.
- * Once the reply is received, it will close down the server and resolve the resulting promise with the data as a string.
- * It is up to the caller to parse this data into a JSON object if necessary.
- */
-export async function runTestCommand(
-    executionFactory: IPythonExecutionFactory,
-    options: TestDiscoveryOptions,
-): Promise<string> {
-    const deferred = createDeferred<string>();
-    let server: http.Server;
-
-    // Create the Python environment in which to execute the command.
-    const creationOptions: ExecutionFactoryCreateWithEnvironmentOptions = {
-        allowEnvironmentFetchExceptions: false,
-        resource: options.workspaceFolder,
-    };
-    const execService = await executionFactory.createActivatedEnvironment(creationOptions);
-
-    const spawnOptions: SpawnOptions = {
-        token: options.token,
-        cwd: options.cwd,
-        throwOnStdErr: true,
-    };
-
-    // Handler to parse the request body.
-    const requestListener: http.RequestListener = async (request, response) => {
-        const buffers = [];
-
-        for await (const chunk of request) {
-            buffers.push(chunk);
-        }
-
-        const data = Buffer.concat(buffers).toString();
-
-        // Close the connection.
-        response.end();
-        server.close();
-
-        deferred.resolve(data);
-    };
-
-    // Create the server, and execute the Python command when it's ready.
-    // The Python command will connect to the server, send its output back, and disconnect.
-    // Once we receive the output, we can close the server (done in requestListener).
-    server = http.createServer(requestListener);
-    server.maxConnections = 1;
-
-    server.listen(DEFAULT_TEST_PORT, async () => {
-        if (options.outChannel) {
-            options.outChannel.appendLine(`python ${options.args.join(' ')}`);
-        }
-
-        try {
-            await execService.exec(options.args, spawnOptions);
-        } catch (ex) {
-            // Close the connection.
-            server.close();
-            deferred.reject(ex);
-        }
-    });
-
-    return deferred.promise;
-}
diff --git a/src/client/testing/testController/common/server.ts b/src/client/testing/testController/common/server.ts
index e1140941c68e..ee347ed52640 100644
--- a/src/client/testing/testController/common/server.ts
+++ b/src/client/testing/testController/common/server.ts
@@ -2,25 +2,24 @@
 // Licensed under the MIT License.
 
 import * as http from 'http';
-import { randomUUID } from 'crypto';
+import { v4 as uuidv4 } from 'uuid';
 import { Event, EventEmitter } from 'vscode';
 import {
     ExecutionFactoryCreateWithEnvironmentOptions,
     IPythonExecutionFactory,
     SpawnOptions,
 } from '../../../common/process/types';
-import { DataReceivedEvent, ITestServer } from './types';
-import { TestDiscoveryOptions } from '../../common/types';
+import { DataReceivedEvent, ITestServer, TestCommandOptions } from './types';
 
 export class PythonTestServer implements ITestServer {
     private _onDataReceived: EventEmitter<DataReceivedEvent> = new EventEmitter<DataReceivedEvent>();
 
-    private uuids: string[];
+    private uuids: Map<string, string>;
 
     private server: http.Server;
 
-    constructor(private executionFactory: IPythonExecutionFactory, readonly port: number) {
-        this.uuids = [];
+    constructor(private executionFactory: IPythonExecutionFactory, private readonly port: number) {
+        this.uuids = new Map();
 
         const requestListener: http.RequestListener = async (request, response) => {
             const buffers = [];
@@ -33,14 +32,14 @@ export class PythonTestServer implements ITestServer {
 
             response.end();
 
-            const { uuid, cwd } = JSON.parse(data);
+            const { uuid } = JSON.parse(data);
 
             // Check if the uuid we received exists in the list of active ones.
             // If yes, process the response, if not, ignore it.
-            const index = this.uuids.indexOf(uuid);
-            if (index !== -1) {
+            const cwd = this.uuids.get(uuid);
+            if (cwd) {
                 this._onDataReceived.fire({ cwd, data });
-                this.uuids.splice(index, 1);
+                this.uuids.delete(uuid);
             }
         };
 
@@ -57,9 +56,9 @@ export class PythonTestServer implements ITestServer {
         return this._onDataReceived.event;
     }
 
-    async sendCommand(options: TestDiscoveryOptions): Promise<void> {
-        const uuid = randomUUID();
-        this.uuids.push(uuid);
+    async sendCommand(options: TestCommandOptions): Promise<void> {
+        const uuid = uuidv4();
+        this.uuids.set(uuid, options.cwd);
 
         const spawnOptions: SpawnOptions = {
             token: options.token,
@@ -75,7 +74,9 @@ export class PythonTestServer implements ITestServer {
         const execService = await this.executionFactory.createActivatedEnvironment(creationOptions);
 
         // Append the generated UUID to the data to be sent (expecting to receive it back).
-        const args = options.args.concat('--uuid', uuid);
+        const args = [options.command.script, '--port', this.port.toString(), '--uuid', uuid].concat(
+            options.command.args,
+        );
 
         if (options.outChannel) {
             options.outChannel.appendLine(`python ${args.join(' ')}`);
diff --git a/src/client/testing/testController/common/types.ts b/src/client/testing/testController/common/types.ts
index 8e67b14c375c..62f1e27be9b7 100644
--- a/src/client/testing/testController/common/types.ts
+++ b/src/client/testing/testController/common/types.ts
@@ -4,6 +4,7 @@
 import {
     CancellationToken,
     Event,
+    OutputChannel,
     TestController,
     TestItem,
     TestRun,
@@ -132,6 +133,19 @@ export type DataReceivedEvent = {
     data: string;
 };
 
+export type TestDiscoveryCommand = {
+    script: string;
+    args: string[];
+};
+
+export type TestCommandOptions = {
+    workspaceFolder: Uri;
+    cwd: string;
+    command: TestDiscoveryCommand;
+    token?: CancellationToken;
+    outChannel?: OutputChannel;
+};
+
 /**
  * Interface describing the server that will send test commands to the Python side, and process responses.
  *
@@ -140,8 +154,7 @@ export type DataReceivedEvent = {
  */
 export interface ITestServer {
     readonly onDataReceived: Event<DataReceivedEvent>;
-    readonly port: number;
-    sendCommand(options: TestDiscoveryOptions): Promise<void>;
+    sendCommand(options: TestCommandOptions): Promise<void>;
 }
 
 export interface ITestDiscoveryAdapter {
diff --git a/src/client/testing/testController/unittest/testDiscoveryAdapter.ts b/src/client/testing/testController/unittest/testDiscoveryAdapter.ts
index 5fc3b8bb3b5e..f0a5a957807c 100644
--- a/src/client/testing/testController/unittest/testDiscoveryAdapter.ts
+++ b/src/client/testing/testController/unittest/testDiscoveryAdapter.ts
@@ -3,13 +3,17 @@
 
 import * as path from 'path';
 import { Uri } from 'vscode';
-// import { IPythonExecutionFactory } from '../../../common/process/types';
 import { IConfigurationService } from '../../../common/types';
 import { createDeferred, Deferred } from '../../../common/utils/async';
 import { EXTENSION_ROOT_DIR } from '../../../constants';
-import { TestDiscoveryOptions } from '../../common/types';
-// import { runTestCommand } from '../common/commandRunner';
-import { DataReceivedEvent, DiscoveredTestPayload, ITestDiscoveryAdapter, ITestServer } from '../common/types';
+import {
+    DataReceivedEvent,
+    DiscoveredTestPayload,
+    ITestDiscoveryAdapter,
+    ITestServer,
+    TestCommandOptions,
+    TestDiscoveryCommand,
+} from '../common/types';
 
 /**
  * Wrapper class for unittest test discovery. This is where we call `runTestCommand`.
@@ -19,12 +23,8 @@ export class UnittestTestDiscoveryAdapter implements ITestDiscoveryAdapter {
 
     private cwd: string | undefined;
 
-    constructor(
-        public testServer: ITestServer,
-        // public executionFactory: IPythonExecutionFactory,
-        public configSettings: IConfigurationService, // public port: number,
-    ) {
-        testServer.onDataReceived(this.onDataReceivedHandler);
+    constructor(public testServer: ITestServer, public configSettings: IConfigurationService) {
+        testServer.onDataReceived(this.onDataReceivedHandler, this);
     }
 
     public onDataReceivedHandler({ cwd, data }: DataReceivedEvent): void {
@@ -41,16 +41,14 @@ export class UnittestTestDiscoveryAdapter implements ITestDiscoveryAdapter {
             const settings = this.configSettings.getSettings(uri);
             const { unittestArgs } = settings.testing;
 
-            const command = this.buildDiscoveryCommand(unittestArgs);
+            const command = buildDiscoveryCommand(unittestArgs);
 
             this.cwd = uri.fsPath;
 
-            const options: TestDiscoveryOptions = {
+            const options: TestCommandOptions = {
                 workspaceFolder: uri,
-                // port: this.port,
-                args: command,
+                command,
                 cwd: this.cwd,
-                ignoreCache: false,
             };
 
             this.deferred = createDeferred<DiscoveredTestPayload>();
@@ -61,14 +59,14 @@ export class UnittestTestDiscoveryAdapter implements ITestDiscoveryAdapter {
         }
 
         return this.deferred.promise;
-        // const result = await runTestCommand(this.executionFactory, options);
-        // const testData = JSON.parse(result);
-
-        // return Promise.resolve(testData);
     }
+}
 
-    private buildDiscoveryCommand(args: string[]): string[] {
-        const discoveryScript = path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'unittestadapter', 'discovery.py');
-        return [discoveryScript, '--port', `${this.testServer.port}`, '--udiscovery', ...args];
-    }
+function buildDiscoveryCommand(args: string[]): TestDiscoveryCommand {
+    const discoveryScript = path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'unittestadapter', 'discovery.py');
+
+    return {
+        script: discoveryScript,
+        args: ['--udiscovery', ...args],
+    };
 }
diff --git a/src/client/testing/testController/workspaceTestAdapter.ts b/src/client/testing/testController/workspaceTestAdapter.ts
index e2ddf0a26462..4ce9b39757e7 100644
--- a/src/client/testing/testController/workspaceTestAdapter.ts
+++ b/src/client/testing/testController/workspaceTestAdapter.ts
@@ -4,7 +4,6 @@
 import * as path from 'path';
 import * as util from 'util';
 import { CancellationToken, Position, Range, TestController, TestItem, Uri } from 'vscode';
-// import { IPythonExecutionFactory } from '../../common/process/types';
 import { IConfigurationService } from '../../common/types';
 import { createDeferred, Deferred } from '../../common/utils/async';
 import { Testing } from '../../common/utils/localize';
diff --git a/src/test/testing/testController/commandRunner.unit.test.ts b/src/test/testing/testController/commandRunner.unit.test.ts
deleted file mode 100644
index d93af3e685c4..000000000000
--- a/src/test/testing/testController/commandRunner.unit.test.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-import * as assert from 'assert';
-import * as http from 'http';
-import { OutputChannel, Uri } from 'vscode';
-import { IPythonExecutionFactory, IPythonExecutionService } from '../../../client/common/process/types';
-import { TestCommandOptions } from '../../../client/testing/common/types';
-import { runTestCommand } from '../../../client/testing/testController/common/commandRunner';
-
-suite('Python command runner', () => {
-    let stubExecutionFactory: IPythonExecutionFactory;
-    let stubExecService: IPythonExecutionService;
-
-    setup(() => {
-        stubExecService = ({
-            exec: async (args: string[]) => {
-                fakeExecutedScript(args.join(' '));
-                return Promise.resolve({
-                    stdout: '',
-                });
-            },
-        } as unknown) as IPythonExecutionService;
-
-        stubExecutionFactory = ({
-            createActivatedEnvironment: async () => Promise.resolve(stubExecService),
-        } as unknown) as IPythonExecutionFactory;
-    });
-
-    // Fake Python script called by the runTestCommand function.
-    // This function will parse the command arg for the server port, and the mock data to return.
-    function fakeExecutedScript(command: string): void {
-        // Parse data
-        const args = command.split(' ');
-        const portIndex = args.indexOf('--port');
-        const dataIndex = args.indexOf('--data');
-
-        const port = args[portIndex + 1];
-        const data = args[dataIndex + 1];
-
-        // Return data
-        const options = {
-            hostname: 'localhost',
-            port,
-            method: 'POST',
-        };
-        const request = http.request(options);
-        request.write(JSON.stringify({ data }));
-        request.end();
-    }
-
-    function buildCommandOptions(data = 'foo', port = 6789): TestCommandOptions {
-        return {
-            workspaceFolder: Uri.parse('foo'),
-            port,
-            cwd: 'foo',
-            args: ['scriptName', '--port', `${port}`, '--data', data],
-            ignoreCache: true,
-        };
-    }
-
-    test('Should resolve with a string if the command was successful', async () => {
-        const options = buildCommandOptions();
-
-        const result = await runTestCommand(stubExecutionFactory, options);
-
-        assert.strictEqual(result, '{"data":"foo"}');
-    });
-
-    test('Should reject the promise if the command failed', async () => {
-        const options = buildCommandOptions();
-
-        stubExecService = ({
-            exec: async () => Promise.reject(new Error('foo')),
-        } as unknown) as IPythonExecutionService;
-
-        assert.rejects(runTestCommand(stubExecutionFactory, options));
-    });
-
-    test('Should write in an output channel if the outputChannel option was passed', async () => {
-        let output = '';
-
-        const stubOutputChannel: OutputChannel = ({
-            appendLine: (line: string) => {
-                output += line;
-            },
-        } as unknown) as OutputChannel;
-
-        const data = 'bar';
-        const options = buildCommandOptions(data);
-        options.outChannel = stubOutputChannel;
-
-        await runTestCommand(stubExecutionFactory, options);
-
-        assert.strictEqual(output, `python scriptName --port ${options.port} --data ${data}`);
-    });
-
-    test('Should close the server if the command was successful', async () => {
-        // Run runTestCommand
-        const port = 6788;
-        const options = buildCommandOptions('foo', port);
-
-        await runTestCommand(stubExecutionFactory, options);
-
-        // Try to create a server listening to the same port
-        const server = http.createServer();
-        server.listen(port);
-
-        assert.ok(server.listening);
-
-        // Close that server
-        server.close();
-    });
-
-    test('Should close the server if the command failed', async () => {
-        // Run runTestCommand
-        const port = 6788;
-        const options = buildCommandOptions('foo', port);
-
-        stubExecService = ({
-            exec: async () => Promise.reject(new Error('foo')),
-        } as unknown) as IPythonExecutionService;
-
-        assert.rejects(runTestCommand(stubExecutionFactory, options));
-
-        // Try to create a server listening to the same port
-        const server = http.createServer();
-        server.listen(port);
-
-        assert.ok(server.listening);
-
-        // Close that server
-        server.close();
-    });
-});

From 2eb5d3d451faa7ad8a5408d3d8a27c9d64bc5dbf Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Wed, 19 Jan 2022 14:45:13 -0800
Subject: [PATCH 62/87] Update Python tests

---
 .../tests/unittestadapter/test_discovery.py     | 17 +++++++++--------
 pythonFiles/unittestadapter/discovery.py        |  3 ++-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pythonFiles/tests/unittestadapter/test_discovery.py b/pythonFiles/tests/unittestadapter/test_discovery.py
index db3ce9079c8d..80cf69e31e47 100644
--- a/pythonFiles/tests/unittestadapter/test_discovery.py
+++ b/pythonFiles/tests/unittestadapter/test_discovery.py
@@ -15,20 +15,21 @@
 @pytest.mark.parametrize(
     "args, expected",
     [
-        (["--port", "6767"], 6767),
-        (["--foo", "something", "--bar", "another"], int(DEFAULT_PORT)),
-        (["--port", "4444", "--foo", "something", "--port", "9999"], 9999),
+        (["--port", "6767", "--uuid", "some-uuid"], (6767, "some-uuid")),
+        (["--foo", "something", "--bar", "another"], (int(DEFAULT_PORT), None)),
+        (["--port", "4444", "--foo", "something", "--port", "9999"], (9999, None)),
+        (["--uuid", "first-uuid", "--bar", "other", "--uuid", "second-uuid"], (int(DEFAULT_PORT), "second-uuid")),
     ],
 )
 def test_parse_cli_args(args, expected) -> None:
-    """The parse_cli_args function should parse and return the port passed as a command-line option.
+    """The parse_cli_args function should parse and return the port and uuid passed as command-line options.
 
-    If there was no --port command-line option, it should return the default port value.
-    If there are multiple --port options, the last one wins.
+    If there were no --port or --uuid command-line option, it should return default values).
+    If there are multiple options, the last one wins.
     """
-    port, _ = parse_cli_args(args)
+    actual = parse_cli_args(args)
 
-    assert expected == port
+    assert expected == actual
 
 
 @pytest.mark.parametrize(
diff --git a/pythonFiles/unittestadapter/discovery.py b/pythonFiles/unittestadapter/discovery.py
index f9194d15c42d..28a68cecf17f 100644
--- a/pythonFiles/unittestadapter/discovery.py
+++ b/pythonFiles/unittestadapter/discovery.py
@@ -9,7 +9,7 @@
 import unittest
 from typing import List, Literal, Optional, Tuple, TypedDict, Union
 
-from utils import TestNode, build_test_tree
+from .utils import TestNode, build_test_tree
 
 # Add the path to pythonFiles to sys.path to find testing_tools.socket_manager.
 PYTHON_FILES = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -83,6 +83,7 @@ def discover_tests(
     The returned dict has the following keys:
 
     - cwd: Absolute path to the test start directory;
+    - uuid: UUID sent by the caller of the Python script, that needs to be sent back as an integrity check;
     - status: Test discovery status, can be "success" or "error";
     - tests: Discoverered tests if any, not present otherwise. Note that the status can be "error" but the payload can still contain tests;
     - errors: Discovery errors if any, not present otherwise.

From e64cefc4f958308695397db9acccc6a0992c55f3 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Wed, 19 Jan 2022 16:30:32 -0800
Subject: [PATCH 63/87] Update tests for testDiscoveryAdapter

---
 .../testDiscoveryAdapter.unit.test.ts         | 85 +++++++++++++++----
 1 file changed, 69 insertions(+), 16 deletions(-)

diff --git a/src/test/testing/testController/unittest/testDiscoveryAdapter.unit.test.ts b/src/test/testing/testController/unittest/testDiscoveryAdapter.unit.test.ts
index 1a79241f8ef1..01be9428b6f2 100644
--- a/src/test/testing/testController/unittest/testDiscoveryAdapter.unit.test.ts
+++ b/src/test/testing/testController/unittest/testDiscoveryAdapter.unit.test.ts
@@ -2,22 +2,20 @@
 // Licensed under the MIT License.
 
 import * as assert from 'assert';
+import * as path from 'path';
 import * as sinon from 'sinon';
 import { Uri } from 'vscode';
-import * as commandRunner from '../../../../client/testing/testController/common/commandRunner';
-import { IPythonExecutionFactory } from '../../../../client/common/process/types';
 import { IConfigurationService } from '../../../../client/common/types';
+import { EXTENSION_ROOT_DIR } from '../../../../client/constants';
+import { ITestServer, TestCommandOptions } from '../../../../client/testing/testController/common/types';
 import { UnittestTestDiscoveryAdapter } from '../../../../client/testing/testController/unittest/testDiscoveryAdapter';
 
 suite('Unittest test discovery adapter', () => {
-    let stubExecutionFactory: IPythonExecutionFactory;
     let stubConfigSettings: IConfigurationService;
 
     const sandbox = sinon.createSandbox();
 
     setup(() => {
-        stubExecutionFactory = ({} as unknown) as IPythonExecutionFactory;
-
         stubConfigSettings = ({
             getSettings: () => ({
                 testing: { unittestArgs: ['-v', '-s', '.', '-p', 'test*'] },
@@ -29,23 +27,78 @@ suite('Unittest test discovery adapter', () => {
         sandbox.restore();
     });
 
-    test('discoverTests should return a JSON object if the command executed successfully', async () => {
-        const stubRunTestCommand = sandbox.stub(commandRunner, 'runTestCommand');
-        stubRunTestCommand.resolves('{"data":"something"}');
+    test('discoverTests should send the discovery command to the test server', async () => {
+        let options: TestCommandOptions | undefined;
+
+        const stubTestServer = ({
+            sendCommand(opt: TestCommandOptions): Promise<void> {
+                options = opt;
+                return Promise.resolve();
+            },
+            onDataReceived: () => {
+                // no body
+            },
+        } as unknown) as ITestServer;
 
-        const adapter = new UnittestTestDiscoveryAdapter(stubExecutionFactory, stubConfigSettings, 6789);
+        const uri = Uri.file('/foo/bar');
+        const script = path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'unittestadapter', 'discovery.py');
 
-        const result = await adapter.discoverTests(Uri.parse('foo'));
+        const adapter = new UnittestTestDiscoveryAdapter(stubTestServer, stubConfigSettings);
+        adapter.discoverTests(uri);
 
-        assert.deepStrictEqual(result, { data: 'something' });
+        assert.deepStrictEqual(options, {
+            workspaceFolder: uri,
+            cwd: uri.fsPath,
+            command: { script, args: ['--udiscovery', '-v', '-s', '.', '-p', 'test*'] },
+        });
     });
 
-    test('discoverTests should throw an error if the command fails', async () => {
-        const stubRunTestCommand = sandbox.stub(commandRunner, 'runTestCommand');
-        stubRunTestCommand.rejects(new Error('an error'));
+    test("onDataReceivedHandler should parse the data if the cwd from the payload matches the test adapter's cwd", async () => {
+        const stubTestServer = ({
+            sendCommand(): Promise<void> {
+                return Promise.resolve();
+            },
+            onDataReceived: () => {
+                // no body
+            },
+        } as unknown) as ITestServer;
+
+        const uri = Uri.file('/foo/bar');
+        const data = { status: 'success' };
+
+        const adapter = new UnittestTestDiscoveryAdapter(stubTestServer, stubConfigSettings);
+        const promise = adapter.discoverTests(uri);
+
+        adapter.onDataReceivedHandler({ cwd: uri.fsPath, data: JSON.stringify(data) });
+
+        const result = await promise;
+
+        assert.deepStrictEqual(result, data);
+    });
+
+    test("onDataReceivedHandler should ignore the data if the cwd from the payload does not match the test adapter's cwd", async () => {
+        const stubTestServer = ({
+            sendCommand(): Promise<void> {
+                return Promise.resolve();
+            },
+            onDataReceived: () => {
+                // no body
+            },
+        } as unknown) as ITestServer;
+
+        const uri = Uri.file('/foo/bar');
+
+        const adapter = new UnittestTestDiscoveryAdapter(stubTestServer, stubConfigSettings);
+        const promise = adapter.discoverTests(uri);
+
+        const data = { status: 'success' };
+        adapter.onDataReceivedHandler({ cwd: 'some/other/path', data: JSON.stringify(data) });
+
+        const nextData = { status: 'error' };
+        adapter.onDataReceivedHandler({ cwd: uri.fsPath, data: JSON.stringify(nextData) });
 
-        const adapter = new UnittestTestDiscoveryAdapter(stubExecutionFactory, stubConfigSettings, 6789);
+        const result = await promise;
 
-        assert.rejects(adapter.discoverTests(Uri.parse('foo')));
+        assert.deepStrictEqual(result, nextData);
     });
 });

From 72dc9c14f54918d26744027e1c942ba1b9c944d7 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Wed, 19 Jan 2022 16:41:47 -0800
Subject: [PATCH 64/87] Fix tests for workspaceTestAdapter

---
 .../testController/workspaceTestAdapter.ts    |  5 ----
 .../workspaceTestAdapter.unit.test.ts         | 27 ++++++++++---------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/client/testing/testController/workspaceTestAdapter.ts b/src/client/testing/testController/workspaceTestAdapter.ts
index 4ce9b39757e7..b96dade34fc9 100644
--- a/src/client/testing/testController/workspaceTestAdapter.ts
+++ b/src/client/testing/testController/workspaceTestAdapter.ts
@@ -19,7 +19,6 @@ import {
     ITestDiscoveryAdapter,
     ITestServer,
 } from './common/types';
-// import { DEFAULT_TEST_PORT } from './common/utils';
 import { UnittestTestDiscoveryAdapter } from './unittest/testDiscoveryAdapter';
 
 /**
@@ -44,14 +43,10 @@ export class WorkspaceTestAdapter {
     constructor(
         private testProvider: TestProvider,
         private workspaceUri: Uri,
-        // index: number,
-        // executionFactory: IPythonExecutionFactory,
         configSettings: IConfigurationService,
         testServer: ITestServer,
     ) {
         if (this.testProvider === 'unittest') {
-            // const port = DEFAULT_TEST_PORT + index * 10;
-
             this.discoveryAdapter = new UnittestTestDiscoveryAdapter(testServer, configSettings);
         } else {
             // TODO: PYTEST DISCOVERY ADAPTER
diff --git a/src/test/testing/testController/workspaceTestAdapter.unit.test.ts b/src/test/testing/testController/workspaceTestAdapter.unit.test.ts
index 224406d8f397..065b637e9ac0 100644
--- a/src/test/testing/testController/workspaceTestAdapter.unit.test.ts
+++ b/src/test/testing/testController/workspaceTestAdapter.unit.test.ts
@@ -5,16 +5,16 @@ import * as assert from 'assert';
 import * as sinon from 'sinon';
 
 import { TestController, TestItem, Uri } from 'vscode';
-import { IPythonExecutionFactory } from '../../../client/common/process/types';
 import { IConfigurationService } from '../../../client/common/types';
 import { UnittestTestDiscoveryAdapter } from '../../../client/testing/testController/unittest/testDiscoveryAdapter';
 import { WorkspaceTestAdapter } from '../../../client/testing/testController/workspaceTestAdapter';
 import * as Telemetry from '../../../client/telemetry';
 import { EventName } from '../../../client/telemetry/constants';
+import { ITestServer } from '../../../client/testing/testController/common/types';
 
 suite('Workspace test adapter', () => {
     suite('Test discovery', () => {
-        let stubExecutionFactory: IPythonExecutionFactory;
+        let stubTestServer: ITestServer;
         let stubConfigSettings: IConfigurationService;
 
         let discoverTestsStub: sinon.SinonStub;
@@ -29,14 +29,21 @@ suite('Workspace test adapter', () => {
         const sandbox = sinon.createSandbox();
 
         setup(() => {
-            stubExecutionFactory = ({} as unknown) as IPythonExecutionFactory;
-
             stubConfigSettings = ({
                 getSettings: () => ({
                     testing: { unittestArgs: ['--foo'] },
                 }),
             } as unknown) as IConfigurationService;
 
+            stubTestServer = ({
+                sendCommand(): Promise<void> {
+                    return Promise.resolve();
+                },
+                onDataReceived: () => {
+                    // no body
+                },
+            } as unknown) as ITestServer;
+
             // For some reason the 'tests' namespace in vscode returns undefined.
             // While I figure out how to expose to the tests, they will run
             // against a stub test controller and stub test items.
@@ -104,9 +111,8 @@ suite('Workspace test adapter', () => {
             const workspaceTestAdapter = new WorkspaceTestAdapter(
                 'unittest',
                 Uri.parse('foo'),
-                1,
-                stubExecutionFactory,
                 stubConfigSettings,
+                stubTestServer,
             );
 
             await workspaceTestAdapter.discoverTests(testController);
@@ -128,9 +134,8 @@ suite('Workspace test adapter', () => {
             const workspaceTestAdapter = new WorkspaceTestAdapter(
                 'unittest',
                 Uri.parse('foo'),
-                1,
-                stubExecutionFactory,
                 stubConfigSettings,
+                stubTestServer,
             );
 
             // Try running discovery twice
@@ -148,9 +153,8 @@ suite('Workspace test adapter', () => {
             const workspaceTestAdapter = new WorkspaceTestAdapter(
                 'unittest',
                 Uri.parse('foo'),
-                1,
-                stubExecutionFactory,
                 stubConfigSettings,
+                stubTestServer,
             );
 
             await workspaceTestAdapter.discoverTests(testController);
@@ -168,9 +172,8 @@ suite('Workspace test adapter', () => {
             const workspaceTestAdapter = new WorkspaceTestAdapter(
                 'unittest',
                 Uri.parse('foo'),
-                1,
-                stubExecutionFactory,
                 stubConfigSettings,
+                stubTestServer,
             );
 
             await workspaceTestAdapter.discoverTests(testController);

From 706bbb12cd287621e7358786ff11e254e39cb977 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Thu, 20 Jan 2022 16:05:48 -0800
Subject: [PATCH 65/87] Add tests to server.ts

---
 .../testing/testController/common/server.ts   |  19 +-
 .../testController/server.unit.test.ts        | 226 ++++++++++++++++++
 2 files changed, 239 insertions(+), 6 deletions(-)
 create mode 100644 src/test/testing/testController/server.unit.test.ts

diff --git a/src/client/testing/testController/common/server.ts b/src/client/testing/testController/common/server.ts
index ee347ed52640..1ae2514c83a3 100644
--- a/src/client/testing/testController/common/server.ts
+++ b/src/client/testing/testController/common/server.ts
@@ -3,7 +3,7 @@
 
 import * as http from 'http';
 import { v4 as uuidv4 } from 'uuid';
-import { Event, EventEmitter } from 'vscode';
+import { Disposable, Event, EventEmitter } from 'vscode';
 import {
     ExecutionFactoryCreateWithEnvironmentOptions,
     IPythonExecutionFactory,
@@ -11,7 +11,7 @@ import {
 } from '../../../common/process/types';
 import { DataReceivedEvent, ITestServer, TestCommandOptions } from './types';
 
-export class PythonTestServer implements ITestServer {
+export class PythonTestServer implements ITestServer, Disposable {
     private _onDataReceived: EventEmitter<DataReceivedEvent> = new EventEmitter<DataReceivedEvent>();
 
     private uuids: Map<string, string>;
@@ -58,14 +58,14 @@ export class PythonTestServer implements ITestServer {
 
     async sendCommand(options: TestCommandOptions): Promise<void> {
         const uuid = uuidv4();
-        this.uuids.set(uuid, options.cwd);
-
         const spawnOptions: SpawnOptions = {
             token: options.token,
             cwd: options.cwd,
             throwOnStdErr: true,
         };
 
+        this.uuids.set(uuid, options.cwd);
+
         // Create the Python environment in which to execute the command.
         const creationOptions: ExecutionFactoryCreateWithEnvironmentOptions = {
             allowEnvironmentFetchExceptions: false,
@@ -73,7 +73,7 @@ export class PythonTestServer implements ITestServer {
         };
         const execService = await this.executionFactory.createActivatedEnvironment(creationOptions);
 
-        // Append the generated UUID to the data to be sent (expecting to receive it back).
+        // Add the generated UUID to the data to be sent (expecting to receive it back).
         const args = [options.command.script, '--port', this.port.toString(), '--uuid', uuid].concat(
             options.command.args,
         );
@@ -85,7 +85,14 @@ export class PythonTestServer implements ITestServer {
         try {
             await execService.exec(args, spawnOptions);
         } catch (ex) {
-            // No catch statement.
+            this.uuids.delete(uuid);
+            this._onDataReceived.fire({
+                cwd: options.cwd,
+                data: JSON.stringify({
+                    status: 'error',
+                    errors: [ex.message],
+                }),
+            });
         }
     }
 }
diff --git a/src/test/testing/testController/server.unit.test.ts b/src/test/testing/testController/server.unit.test.ts
new file mode 100644
index 000000000000..3ceb8d16f376
--- /dev/null
+++ b/src/test/testing/testController/server.unit.test.ts
@@ -0,0 +1,226 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import * as assert from 'assert';
+import * as http from 'http';
+import * as sinon from 'sinon';
+import * as uuid from 'uuid';
+import { OutputChannel, Uri } from 'vscode';
+import { IPythonExecutionFactory, IPythonExecutionService } from '../../../client/common/process/types';
+import { createDeferred } from '../../../client/common/utils/async';
+import { PythonTestServer } from '../../../client/testing/testController/common/server';
+import { DEFAULT_TEST_PORT } from '../../../client/testing/testController/common/utils';
+
+suite('Python Test Server', () => {
+    const port = DEFAULT_TEST_PORT;
+    const fakeUuid = 'fake-uuid';
+
+    let stubExecutionFactory: IPythonExecutionFactory;
+    let stubExecutionService: IPythonExecutionService;
+    let server: PythonTestServer;
+    let sandbox: sinon.SinonSandbox;
+    let execArgs: string[];
+    let v4Stub: sinon.SinonStub;
+
+    setup(() => {
+        sandbox = sinon.createSandbox();
+        v4Stub = sandbox.stub(uuid, 'v4');
+
+        v4Stub.returns(fakeUuid);
+        stubExecutionService = ({
+            exec: (args: string[]) => {
+                execArgs = args;
+                return Promise.resolve({ stdout: '', stderr: '' });
+            },
+        } as unknown) as IPythonExecutionService;
+
+        stubExecutionFactory = ({
+            createActivatedEnvironment: () => Promise.resolve(stubExecutionService),
+        } as unknown) as IPythonExecutionFactory;
+    });
+
+    teardown(() => {
+        sandbox.restore();
+        execArgs = [];
+        server.dispose();
+    });
+
+    test('sendCommand should add the port and uuid to the command being sent', async () => {
+        const options = {
+            command: { script: 'myscript', args: ['-foo', 'foo'] },
+            workspaceFolder: Uri.file('/foo/bar'),
+            cwd: '/foo/bar',
+        };
+
+        server = new PythonTestServer(stubExecutionFactory, port);
+
+        await server.sendCommand(options);
+
+        assert.deepStrictEqual(execArgs, ['myscript', '--port', `${port}`, '--uuid', fakeUuid, '-foo', 'foo']);
+    });
+
+    test('sendCommand should write to an output channel if it is provided as an option', async () => {
+        const output: string[] = [];
+        const outChannel = {
+            appendLine: (str: string) => {
+                output.push(str);
+            },
+        } as OutputChannel;
+        const options = {
+            command: { script: 'myscript', args: ['-foo', 'foo'] },
+            workspaceFolder: Uri.file('/foo/bar'),
+            cwd: '/foo/bar',
+            outChannel,
+        };
+        const expected = ['python', 'myscript', '--port', `${port}`, '--uuid', fakeUuid, '-foo', 'foo'].join(' ');
+
+        server = new PythonTestServer(stubExecutionFactory, port);
+
+        await server.sendCommand(options);
+
+        assert.deepStrictEqual(output, [expected]);
+    });
+
+    test('If script execution fails during sendCommand, an onDataReceived event should be fired with the "error" status', async () => {
+        let eventData: { status: string; errors: string[] };
+        stubExecutionService = ({
+            exec: () => {
+                throw new Error('Failed to execute');
+            },
+        } as unknown) as IPythonExecutionService;
+
+        const options = {
+            command: { script: 'myscript', args: ['-foo', 'foo'] },
+            workspaceFolder: Uri.file('/foo/bar'),
+            cwd: '/foo/bar',
+        };
+
+        server = new PythonTestServer(stubExecutionFactory, port);
+        server.onDataReceived(({ data }) => {
+            eventData = JSON.parse(data);
+        });
+
+        await server.sendCommand(options);
+
+        assert.deepStrictEqual(eventData!.status, 'error');
+        assert.deepStrictEqual(eventData!.errors, ['Failed to execute']);
+    });
+
+    test('If the server receives data, it should fire an event if it is a known uuid', async () => {
+        const deferred = createDeferred();
+        const options = {
+            command: { script: 'myscript', args: ['-foo', 'foo'] },
+            workspaceFolder: Uri.file('/foo/bar'),
+            cwd: '/foo/bar',
+        };
+
+        let response;
+
+        server = new PythonTestServer(stubExecutionFactory, port);
+        server.onDataReceived(({ data }) => {
+            response = data;
+            deferred.resolve();
+        });
+
+        await server.sendCommand(options);
+
+        // Send data back.
+        const requestOptions = {
+            hostname: 'localhost',
+            method: 'POST',
+            port,
+        };
+
+        const request = http.request(requestOptions, (res) => {
+            res.setEncoding('utf8');
+        });
+        const postData = JSON.stringify({ status: 'success', uuid: fakeUuid });
+        request.write(postData);
+        request.end();
+
+        await deferred.promise;
+
+        assert.deepStrictEqual(response, postData);
+    });
+
+    test('If the server receives data, it should not fire an event if it is an unknown uuid', async () => {
+        const deferred = createDeferred();
+        const options = {
+            command: { script: 'myscript', args: ['-foo', 'foo'] },
+            workspaceFolder: Uri.file('/foo/bar'),
+            cwd: '/foo/bar',
+        };
+
+        let response;
+
+        server = new PythonTestServer(stubExecutionFactory, port);
+        server.onDataReceived(({ data }) => {
+            response = data;
+            deferred.resolve();
+        });
+
+        await server.sendCommand(options);
+
+        // Send data back.
+        const requestOptions = {
+            hostname: 'localhost',
+            method: 'POST',
+            port,
+        };
+
+        const request = http.request(requestOptions, (res) => {
+            res.setEncoding('utf8');
+        });
+        const postData = JSON.stringify({ status: 'success', uuid: fakeUuid, payload: 'foo' });
+        request.write(postData);
+        request.end();
+
+        await deferred.promise;
+
+        assert.deepStrictEqual(response, postData);
+    });
+
+    test('If the server receives data, it should not fire an event if there is no uuid', async () => {
+        const deferred = createDeferred();
+        const options = {
+            command: { script: 'myscript', args: ['-foo', 'foo'] },
+            workspaceFolder: Uri.file('/foo/bar'),
+            cwd: '/foo/bar',
+        };
+
+        let response;
+
+        server = new PythonTestServer(stubExecutionFactory, port);
+        server.onDataReceived(({ data }) => {
+            response = data;
+            deferred.resolve();
+        });
+
+        await server.sendCommand(options);
+
+        // Send data back.
+        const requestOptions = {
+            hostname: 'localhost',
+            method: 'POST',
+            port,
+        };
+
+        const requestOne = http.request(requestOptions, (res) => {
+            res.setEncoding('utf8');
+        });
+        const postDataOne = JSON.stringify({ status: 'success', uuid: 'some-other-uuid', payload: 'foo' });
+        requestOne.write(postDataOne);
+        requestOne.end();
+
+        const requestTwo = http.request(requestOptions, (res) => {
+            res.setEncoding('utf8');
+        });
+        const postDataTwo = JSON.stringify({ status: 'success', uuid: fakeUuid, payload: 'foo' });
+        requestTwo.write(postDataTwo);
+        requestTwo.end();
+
+        await deferred.promise;
+
+        assert.deepStrictEqual(response, postDataTwo);
+    });
+});

From 52dbb9b99ca022bc03b378140999524443ed27e9 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Thu, 20 Jan 2022 16:05:59 -0800
Subject: [PATCH 66/87] Cleanup

---
 .../unittest/testDiscoveryAdapter.unit.test.ts             | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/test/testing/testController/unittest/testDiscoveryAdapter.unit.test.ts b/src/test/testing/testController/unittest/testDiscoveryAdapter.unit.test.ts
index 01be9428b6f2..cee4353db09a 100644
--- a/src/test/testing/testController/unittest/testDiscoveryAdapter.unit.test.ts
+++ b/src/test/testing/testController/unittest/testDiscoveryAdapter.unit.test.ts
@@ -3,7 +3,6 @@
 
 import * as assert from 'assert';
 import * as path from 'path';
-import * as sinon from 'sinon';
 import { Uri } from 'vscode';
 import { IConfigurationService } from '../../../../client/common/types';
 import { EXTENSION_ROOT_DIR } from '../../../../client/constants';
@@ -13,8 +12,6 @@ import { UnittestTestDiscoveryAdapter } from '../../../../client/testing/testCon
 suite('Unittest test discovery adapter', () => {
     let stubConfigSettings: IConfigurationService;
 
-    const sandbox = sinon.createSandbox();
-
     setup(() => {
         stubConfigSettings = ({
             getSettings: () => ({
@@ -23,10 +20,6 @@ suite('Unittest test discovery adapter', () => {
         } as unknown) as IConfigurationService;
     });
 
-    teardown(() => {
-        sandbox.restore();
-    });
-
     test('discoverTests should send the discovery command to the test server', async () => {
         let options: TestCommandOptions | undefined;
 

From 2453730a9720a8cd837cea24dc80a789404bf77d Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Thu, 20 Jan 2022 16:15:29 -0800
Subject: [PATCH 67/87] Add uuid to discovery tests

---
 .../tests/unittestadapter/test_discovery.py    | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pythonFiles/tests/unittestadapter/test_discovery.py b/pythonFiles/tests/unittestadapter/test_discovery.py
index 80cf69e31e47..cc434f031dd5 100644
--- a/pythonFiles/tests/unittestadapter/test_discovery.py
+++ b/pythonFiles/tests/unittestadapter/test_discovery.py
@@ -66,7 +66,7 @@ def test_parse_unittest_args(args, expected) -> None:
 
 
 def test_simple_discovery() -> None:
-    """The discover_tests function should return a dictionary with a "success" status, no errors, and a test tree
+    """The discover_tests function should return a dictionary with a "success" status, a uuid, no errors, and a test tree
     if unittest discovery was performed successfully.
     """
     start_dir = os.fsdecode(TEST_DATA_PATH)
@@ -109,29 +109,33 @@ def test_simple_discovery() -> None:
         ],
     }
 
-    actual = discover_tests(start_dir, pattern, None, None)
+    uuid = 'some-uuid'
+    actual = discover_tests(start_dir, pattern, None, uuid)
 
     assert actual["status"] == "success"
+    assert actual["uuid"] == uuid
     assert is_same_tree(actual.get("tests"), expected)
     assert "errors" not in actual
 
 
 def test_empty_discovery() -> None:
-    """The discover_tests function should return a dictionary with a "success" status, no errors, and no test tree
+    """The discover_tests function should return a dictionary with a "success" status, a uuid, no errors, and no test tree
     if unittest discovery was performed successfully but no tests were found.
     """
     start_dir = os.fsdecode(TEST_DATA_PATH)
     pattern = "discovery_empty*"
 
-    actual = discover_tests(start_dir, pattern, None, None)
+    uuid = 'some-uuid'
+    actual = discover_tests(start_dir, pattern, None, uuid)
 
     assert actual["status"] == "success"
+    assert actual["uuid"] == uuid
     assert "tests" not in actual
     assert "errors" not in actual
 
 
 def test_error_discovery() -> None:
-    """The discover_tests function should return a dictionary with an "error" status, the discovered tests, and a list of errors
+    """The discover_tests function should return a dictionary with an "error" status, a uuid, the discovered tests, and a list of errors
     if unittest discovery failed at some point.
     """
     # Discover tests in .data/discovery_error/.
@@ -177,8 +181,10 @@ def test_error_discovery() -> None:
         ],
     }
 
-    actual = discover_tests(start_dir, pattern, None, None)
+    uuid = 'some-uuid'
+    actual = discover_tests(start_dir, pattern, None, uuid)
 
     assert actual["status"] == "error"
+    assert actual["uuid"] == uuid
     assert is_same_tree(expected, actual.get("tests"))
     assert len(actual.get("errors", [])) == 1

From 4b4684766e412c062d2e9a3b484bf3424404463c Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Fri, 21 Jan 2022 11:47:43 -0800
Subject: [PATCH 68/87] Python linting

---
 .../tests/unittestadapter/test_discovery.py   | 19 +++++++++++++------
 pythonFiles/unittestadapter/discovery.py      |  5 +++--
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/pythonFiles/tests/unittestadapter/test_discovery.py b/pythonFiles/tests/unittestadapter/test_discovery.py
index cc434f031dd5..9ffe8cd7462d 100644
--- a/pythonFiles/tests/unittestadapter/test_discovery.py
+++ b/pythonFiles/tests/unittestadapter/test_discovery.py
@@ -5,8 +5,12 @@
 import pathlib
 
 import pytest
-from unittestadapter.discovery import (DEFAULT_PORT, discover_tests,
-                                       parse_cli_args, parse_unittest_args)
+from unittestadapter.discovery import (
+    DEFAULT_PORT,
+    discover_tests,
+    parse_cli_args,
+    parse_unittest_args,
+)
 from unittestadapter.utils import TestNodeTypeEnum
 
 from .helpers import TEST_DATA_PATH, is_same_tree
@@ -18,7 +22,10 @@
         (["--port", "6767", "--uuid", "some-uuid"], (6767, "some-uuid")),
         (["--foo", "something", "--bar", "another"], (int(DEFAULT_PORT), None)),
         (["--port", "4444", "--foo", "something", "--port", "9999"], (9999, None)),
-        (["--uuid", "first-uuid", "--bar", "other", "--uuid", "second-uuid"], (int(DEFAULT_PORT), "second-uuid")),
+        (
+            ["--uuid", "first-uuid", "--bar", "other", "--uuid", "second-uuid"],
+            (int(DEFAULT_PORT), "second-uuid"),
+        ),
     ],
 )
 def test_parse_cli_args(args, expected) -> None:
@@ -109,7 +116,7 @@ def test_simple_discovery() -> None:
         ],
     }
 
-    uuid = 'some-uuid'
+    uuid = "some-uuid"
     actual = discover_tests(start_dir, pattern, None, uuid)
 
     assert actual["status"] == "success"
@@ -125,7 +132,7 @@ def test_empty_discovery() -> None:
     start_dir = os.fsdecode(TEST_DATA_PATH)
     pattern = "discovery_empty*"
 
-    uuid = 'some-uuid'
+    uuid = "some-uuid"
     actual = discover_tests(start_dir, pattern, None, uuid)
 
     assert actual["status"] == "success"
@@ -181,7 +188,7 @@ def test_error_discovery() -> None:
         ],
     }
 
-    uuid = 'some-uuid'
+    uuid = "some-uuid"
     actual = discover_tests(start_dir, pattern, None, uuid)
 
     assert actual["status"] == "error"
diff --git a/pythonFiles/unittestadapter/discovery.py b/pythonFiles/unittestadapter/discovery.py
index 28a68cecf17f..de956066123d 100644
--- a/pythonFiles/unittestadapter/discovery.py
+++ b/pythonFiles/unittestadapter/discovery.py
@@ -41,6 +41,7 @@ def parse_cli_args(args: List[str]) -> Tuple[int, Union[str, None]]:
 
     return int(parsed_args.port), parsed_args.uuid
 
+
 def parse_unittest_args(args: List[str]) -> Tuple[str, str, Union[str, None]]:
     """Parse command-line arguments that should be forwarded to unittest.
 
@@ -143,7 +144,7 @@ def discover_tests(
     payload = discover_tests(start_dir, pattern, top_level_dir, uuid)
 
     # Build the request data (it has to be a POST request or the Node side will not process it), and send it.
-    addr = ('localhost', port)
+    addr = ("localhost", port)
     with socket_manager.SocketManager(addr) as s:
         data = json.dumps(payload)
         request = f"""POST / HTTP/1.1
@@ -152,4 +153,4 @@ def discover_tests(
 Content-Type: application/json
 
 {data}"""
-        result = s.socket.sendall(request.encode("utf-8")) # type: ignore
+        result = s.socket.sendall(request.encode("utf-8"))  # type: ignore

From f90fc7126555c58f071b4b9de759bb8e9cf2f5be Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Fri, 21 Jan 2022 11:51:58 -0800
Subject: [PATCH 69/87] Add description to the SocketManager class

---
 pythonFiles/testing_tools/socket_manager.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pythonFiles/testing_tools/socket_manager.py b/pythonFiles/testing_tools/socket_manager.py
index c32c70d780c7..554cf26be103 100644
--- a/pythonFiles/testing_tools/socket_manager.py
+++ b/pythonFiles/testing_tools/socket_manager.py
@@ -6,6 +6,18 @@
 
 
 class SocketManager(object):
+    """Create a socket and connect to the given address.
+
+    The address is a (host: str, port: int) tuple.
+    Example usage:
+
+    ```
+    with SocketManager(("localhost", 6767)) as sock:
+        request = json.dumps(payload)
+        result = s.socket.sendall(request.encode("utf-8"))
+    ```
+    """
+
     def __init__(self, addr):
         self.socket = None
         self.addr = addr

From d64a6c68e37a45cb14382204837cdd8514506036 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Fri, 21 Jan 2022 11:57:34 -0800
Subject: [PATCH 70/87] Fix/silence sonar issues

---
 src/client/testing/testController/common/types.ts         | 1 -
 src/client/testing/testController/controller.ts           | 8 ++------
 src/client/testing/testController/workspaceTestAdapter.ts | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/client/testing/testController/common/types.ts b/src/client/testing/testController/common/types.ts
index 62f1e27be9b7..00d90605c02a 100644
--- a/src/client/testing/testController/common/types.ts
+++ b/src/client/testing/testController/common/types.ts
@@ -12,7 +12,6 @@ import {
     Uri,
     WorkspaceFolder,
 } from 'vscode';
-// import { IPythonExecutionFactory } from '../../../common/process/types';
 import { IConfigurationService } from '../../../common/types';
 import { TestDiscoveryOptions } from '../../common/types';
 
diff --git a/src/client/testing/testController/controller.ts b/src/client/testing/testController/controller.ts
index 15b40b6d5720..13369f881a41 100644
--- a/src/client/testing/testController/controller.ts
+++ b/src/client/testing/testController/controller.ts
@@ -108,15 +108,11 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
 
     public async activate(): Promise<void> {
         const workspaces: readonly WorkspaceFolder[] = this.workspaceService.workspaceFolders || [];
-        for (let i = 0; i < workspaces.length; i += 1) {
-            const workspace = workspaces[i];
-            console.warn(`instantiating test adapters - workspace name: ${workspace.name}`);
+        workspaces.forEach((workspace) => {
             const settings = this.configSettings.getSettings(workspace.uri);
             const workspaceTestAdapter = new WorkspaceTestAdapter(
                 'unittest',
                 workspace.uri,
-                // i,
-                // this.pythonExecFactory,
                 this.configSettings,
                 this.pythonTestServer,
             );
@@ -128,7 +124,7 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
                 this.watchForSettingsChanges(workspace);
                 this.watchForTestContentChanges(workspace);
             }
-        }
+        });
     }
 
     public refreshTestData(uri?: Resource, options?: TestRefreshOptions): Promise<void> {
diff --git a/src/client/testing/testController/workspaceTestAdapter.ts b/src/client/testing/testController/workspaceTestAdapter.ts
index b96dade34fc9..5e1c4765c102 100644
--- a/src/client/testing/testController/workspaceTestAdapter.ts
+++ b/src/client/testing/testController/workspaceTestAdapter.ts
@@ -51,7 +51,7 @@ export class WorkspaceTestAdapter {
         } else {
             // TODO: PYTEST DISCOVERY ADAPTER
             // this is a placeholder for now
-            this.discoveryAdapter = new UnittestTestDiscoveryAdapter(testServer, configSettings);
+            this.discoveryAdapter = new UnittestTestDiscoveryAdapter(testServer, configSettings); // NOSONAR
         }
     }
 

From fe488e5332a60cafc74f44c61c2a1919d898c947 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Fri, 21 Jan 2022 12:05:11 -0800
Subject: [PATCH 71/87] Try to silence sonar for now

---
 src/client/testing/testController/workspaceTestAdapter.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/testing/testController/workspaceTestAdapter.ts b/src/client/testing/testController/workspaceTestAdapter.ts
index 5e1c4765c102..3000675303bf 100644
--- a/src/client/testing/testController/workspaceTestAdapter.ts
+++ b/src/client/testing/testController/workspaceTestAdapter.ts
@@ -51,7 +51,7 @@ export class WorkspaceTestAdapter {
         } else {
             // TODO: PYTEST DISCOVERY ADAPTER
             // this is a placeholder for now
-            this.discoveryAdapter = new UnittestTestDiscoveryAdapter(testServer, configSettings); // NOSONAR
+            this.discoveryAdapter = new UnittestTestDiscoveryAdapter(testServer, { ...configSettings });
         }
     }
 

From e6f551587ae6bb0c1658b17f8d707a8456b0ea5e Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Fri, 21 Jan 2022 15:27:47 -0800
Subject: [PATCH 72/87] Add comment for tornado

---
 pythonFiles/unittestadapter/utils.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pythonFiles/unittestadapter/utils.py b/pythonFiles/unittestadapter/utils.py
index ad6b705e702f..64b213b13a55 100644
--- a/pythonFiles/unittestadapter/utils.py
+++ b/pythonFiles/unittestadapter/utils.py
@@ -53,6 +53,7 @@ def get_source_line(obj) -> str:
         sourcelines, lineno = inspect.getsourcelines(obj)
     except:
         try:
+            # tornado-specific, see https://github.com/microsoft/vscode-python/issues/17285.
             sourcelines, lineno = inspect.getsourcelines(obj.orig_method)
         except:
             return "*"

From f2d4ad86274c0f3a42aeb97ccdb6af2ac6e56923 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <51720070+kimadeline@users.noreply.github.com>
Date: Tue, 1 Feb 2022 07:14:06 -0800
Subject: [PATCH 73/87] Apply Python suggestions from code review

Co-authored-by: Brett Cannon <brett@python.org>
---
 pythonFiles/testing_tools/socket_manager.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pythonFiles/testing_tools/socket_manager.py b/pythonFiles/testing_tools/socket_manager.py
index 554cf26be103..1855f30f343c 100644
--- a/pythonFiles/testing_tools/socket_manager.py
+++ b/pythonFiles/testing_tools/socket_manager.py
@@ -19,8 +19,8 @@ class SocketManager(object):
     """
 
     def __init__(self, addr):
-        self.socket = None
         self.addr = addr
+        self.socket = None
 
     def __enter__(self):
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM, socket.IPPROTO_TCP)
@@ -33,7 +33,7 @@ def __enter__(self):
 
         return self
 
-    def __exit__(self, type, value, tb):
+    def __exit__(self, *_):
         if self.socket:
             try:
                 self.socket.shutdown(socket.SHUT_RDWR)

From 8cb7c58dccc181d917fc9af0e0cdfb0e72ba513b Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Tue, 1 Feb 2022 07:16:25 -0800
Subject: [PATCH 74/87] Wrap line

---
 pythonFiles/tests/unittestadapter/test_utils.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pythonFiles/tests/unittestadapter/test_utils.py b/pythonFiles/tests/unittestadapter/test_utils.py
index cb541c486e1b..dc72eb4357f1 100644
--- a/pythonFiles/tests/unittestadapter/test_utils.py
+++ b/pythonFiles/tests/unittestadapter/test_utils.py
@@ -155,7 +155,9 @@ def test_no_existing_child_node() -> None:
 
 
 def test_build_simple_tree() -> None:
-    """The build_test_tree function should build and return a test tree from discovered test suites, and an empty list of errors if there are none in the discovered data."""
+    """The build_test_tree function should build and return a test tree from discovered test suites,
+    and an empty list of errors if there are none in the discovered data.
+    """
 
     # Discovery tests in utils_simple_tree.py.
     start_dir = os.fsdecode(TEST_DATA_PATH)

From acb1900590d284417be6771789b71a2175509f30 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <51720070+kimadeline@users.noreply.github.com>
Date: Tue, 1 Feb 2022 12:03:54 -0800
Subject: [PATCH 75/87] Update pythonFiles/testing_tools/socket_manager.py

Co-authored-by: Brett Cannon <brett@python.org>
---
 pythonFiles/testing_tools/socket_manager.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pythonFiles/testing_tools/socket_manager.py b/pythonFiles/testing_tools/socket_manager.py
index 1855f30f343c..1eb54274845a 100644
--- a/pythonFiles/testing_tools/socket_manager.py
+++ b/pythonFiles/testing_tools/socket_manager.py
@@ -23,12 +23,12 @@ def __init__(self, addr):
         self.socket = None
 
     def __enter__(self):
-        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM, socket.IPPROTO_TCP)
+        self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM, socket.IPPROTO_TCP)
         if sys.platform == "win32":
-            sock.setsockopt(socket.SOL_SOCKET, socket.SO_EXCLUSIVEADDRUSE, 1)
+            addr_use = socket.SO_EXCLUSIVEADDRUSE
         else:
-            sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        self.socket = sock
+            addr_use = socket.SO_REUSEADDR
+        self.sock.setsockopt(socket.SOL_SOCKET, addr_use, 1)
         sock.connect(self.addr)
 
         return self

From 54ca85115accf1aa6d9a4342438c78ebfed44333 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <51720070+kimadeline@users.noreply.github.com>
Date: Tue, 1 Feb 2022 12:05:13 -0800
Subject: [PATCH 76/87] Update pythonFiles/unittestadapter/utils.py

Co-authored-by: Brett Cannon <brett@python.org>
---
 pythonFiles/unittestadapter/utils.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pythonFiles/unittestadapter/utils.py b/pythonFiles/unittestadapter/utils.py
index 64b213b13a55..207bff2d27b5 100644
--- a/pythonFiles/unittestadapter/utils.py
+++ b/pythonFiles/unittestadapter/utils.py
@@ -146,9 +146,8 @@ def build_test_tree(
         else:
             # Get the static test path components: filename, class name and function name.
             components = test_id.split(".")
-            filename, class_name, function_name = components[:3]
+            *folders, filename, class_name, function_name = components
             py_filename = f"{filename}.py"
-            folders = components[:-3]
 
             current_node = root
 

From dd36da1d764893d14025e6a12c6c798ba322ccff Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Tue, 1 Feb 2022 12:08:32 -0800
Subject: [PATCH 77/87] Use self.socket

---
 pythonFiles/testing_tools/socket_manager.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pythonFiles/testing_tools/socket_manager.py b/pythonFiles/testing_tools/socket_manager.py
index 1eb54274845a..372a50b5e012 100644
--- a/pythonFiles/testing_tools/socket_manager.py
+++ b/pythonFiles/testing_tools/socket_manager.py
@@ -23,13 +23,15 @@ def __init__(self, addr):
         self.socket = None
 
     def __enter__(self):
-        self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM, socket.IPPROTO_TCP)
+        self.socket = socket.socket(
+            socket.AF_INET, socket.SOCK_STREAM, socket.IPPROTO_TCP
+        )
         if sys.platform == "win32":
             addr_use = socket.SO_EXCLUSIVEADDRUSE
         else:
             addr_use = socket.SO_REUSEADDR
-        self.sock.setsockopt(socket.SOL_SOCKET, addr_use, 1)
-        sock.connect(self.addr)
+        self.socket.setsockopt(socket.SOL_SOCKET, addr_use, 1)
+        self.socket.connect(self.addr)
 
         return self
 

From 314b02c492a84935f4860a297b2d97491b2bb28f Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Tue, 8 Feb 2022 11:19:12 -0800
Subject: [PATCH 78/87] Pass test discovery adapter to workspace adapter

---
 .../testing/testController/common/types.ts    |  4 --
 .../testing/testController/controller.ts      | 25 ++++++++----
 .../testController/workspaceTestAdapter.ts    | 30 +++------------
 .../workspaceTestAdapter.unit.test.ts         | 38 +++++++------------
 4 files changed, 36 insertions(+), 61 deletions(-)

diff --git a/src/client/testing/testController/common/types.ts b/src/client/testing/testController/common/types.ts
index 00d90605c02a..ab0365f2698d 100644
--- a/src/client/testing/testController/common/types.ts
+++ b/src/client/testing/testController/common/types.ts
@@ -12,7 +12,6 @@ import {
     Uri,
     WorkspaceFolder,
 } from 'vscode';
-import { IConfigurationService } from '../../../common/types';
 import { TestDiscoveryOptions } from '../../common/types';
 
 export type TestRunInstanceOptions = TestRunOptions & {
@@ -157,9 +156,6 @@ export interface ITestServer {
 }
 
 export interface ITestDiscoveryAdapter {
-    // executionFactory: IPythonExecutionFactory;
-    configSettings: IConfigurationService;
-    // port: number;
     discoverTests(uri: Uri): Promise<DiscoveredTestPayload>;
 }
 
diff --git a/src/client/testing/testController/controller.ts b/src/client/testing/testController/controller.ts
index 13369f881a41..a0c33c97f517 100644
--- a/src/client/testing/testController/controller.ts
+++ b/src/client/testing/testController/controller.ts
@@ -21,14 +21,17 @@ import { IWorkspaceService } from '../../common/application/types';
 import { IPythonExecutionFactory } from '../../common/process/types';
 import { IConfigurationService, IDisposableRegistry, Resource } from '../../common/types';
 import { DelayedTrigger, IDelayedTrigger } from '../../common/utils/delayTrigger';
+import { Common } from '../../common/utils/localize';
 import { traceVerbose } from '../../logging';
 import { sendTelemetryEvent } from '../../telemetry';
 import { EventName } from '../../telemetry/constants';
 import { PYTEST_PROVIDER, UNITTEST_PROVIDER } from '../common/constants';
+import { TestProvider } from '../types';
 import { PythonTestServer } from './common/server';
 import { DebugTestTag, getNodeByUri, RunTestTag } from './common/testItemUtilities';
-import { ITestController, ITestFrameworkController, TestRefreshOptions } from './common/types';
+import { ITestController, ITestDiscoveryAdapter, ITestFrameworkController, TestRefreshOptions } from './common/types';
 import { DEFAULT_TEST_PORT } from './common/utils';
+import { UnittestTestDiscoveryAdapter } from './unittest/testDiscoveryAdapter';
 import { WorkspaceTestAdapter } from './workspaceTestAdapter';
 
 @injectable()
@@ -110,12 +113,20 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
         const workspaces: readonly WorkspaceFolder[] = this.workspaceService.workspaceFolders || [];
         workspaces.forEach((workspace) => {
             const settings = this.configSettings.getSettings(workspace.uri);
-            const workspaceTestAdapter = new WorkspaceTestAdapter(
-                'unittest',
-                workspace.uri,
-                this.configSettings,
-                this.pythonTestServer,
-            );
+
+            let discoveryAdapter: ITestDiscoveryAdapter;
+            let testProvider: TestProvider;
+            if (settings.testing.unittestEnabled) {
+                discoveryAdapter = new UnittestTestDiscoveryAdapter(this.pythonTestServer, this.configSettings);
+                testProvider = UNITTEST_PROVIDER;
+            } else {
+                // TODO: PYTEST DISCOVERY ADAPTER
+                // this is a placeholder for now
+                discoveryAdapter = new UnittestTestDiscoveryAdapter(this.pythonTestServer, { ...this.configSettings });
+                testProvider = PYTEST_PROVIDER;
+            }
+
+            const workspaceTestAdapter = new WorkspaceTestAdapter(testProvider, discoveryAdapter, workspace.uri);
 
             this.testAdapters.set(workspace.uri, workspaceTestAdapter);
 
diff --git a/src/client/testing/testController/workspaceTestAdapter.ts b/src/client/testing/testController/workspaceTestAdapter.ts
index 3000675303bf..b9814948bc03 100644
--- a/src/client/testing/testController/workspaceTestAdapter.ts
+++ b/src/client/testing/testController/workspaceTestAdapter.ts
@@ -4,7 +4,6 @@
 import * as path from 'path';
 import * as util from 'util';
 import { CancellationToken, Position, Range, TestController, TestItem, Uri } from 'vscode';
-import { IConfigurationService } from '../../common/types';
 import { createDeferred, Deferred } from '../../common/utils/async';
 import { Testing } from '../../common/utils/localize';
 import { traceError } from '../../logging';
@@ -12,14 +11,7 @@ import { sendTelemetryEvent } from '../../telemetry';
 import { EventName } from '../../telemetry/constants';
 import { TestProvider } from '../types';
 import { createErrorTestItem, DebugTestTag, ErrorTestItemOptions, RunTestTag } from './common/testItemUtilities';
-import {
-    DiscoveredTestItem,
-    DiscoveredTestNode,
-    DiscoveredTestType,
-    ITestDiscoveryAdapter,
-    ITestServer,
-} from './common/types';
-import { UnittestTestDiscoveryAdapter } from './unittest/testDiscoveryAdapter';
+import { DiscoveredTestItem, DiscoveredTestNode, DiscoveredTestType, ITestDiscoveryAdapter } from './common/types';
 
 /**
  * This class exposes a test-provider-agnostic way of discovering tests.
@@ -31,29 +23,17 @@ import { UnittestTestDiscoveryAdapter } from './unittest/testDiscoveryAdapter';
  * and uses them to insert/update/remove items in the `TestController` instance behind the testing UI whenever the `PythonTestController` requests a refresh.
  */
 export class WorkspaceTestAdapter {
-    private discoveryAdapter: ITestDiscoveryAdapter;
-
     private discovering: Deferred<void> | undefined = undefined;
 
     private testData: DiscoveredTestNode | undefined;
 
-    // TODO: Implement test running
-    // private running: ITestRunningAdapter;
-
     constructor(
         private testProvider: TestProvider,
+        private discoveryAdapter: ITestDiscoveryAdapter,
+        // TODO: Implement test running
+        // private runningAdapter: ITestRunningAdapter,
         private workspaceUri: Uri,
-        configSettings: IConfigurationService,
-        testServer: ITestServer,
-    ) {
-        if (this.testProvider === 'unittest') {
-            this.discoveryAdapter = new UnittestTestDiscoveryAdapter(testServer, configSettings);
-        } else {
-            // TODO: PYTEST DISCOVERY ADAPTER
-            // this is a placeholder for now
-            this.discoveryAdapter = new UnittestTestDiscoveryAdapter(testServer, { ...configSettings });
-        }
-    }
+    ) {}
 
     public async discoverTests(
         testController: TestController,
diff --git a/src/test/testing/testController/workspaceTestAdapter.unit.test.ts b/src/test/testing/testController/workspaceTestAdapter.unit.test.ts
index 065b637e9ac0..b0af0393a9ca 100644
--- a/src/test/testing/testController/workspaceTestAdapter.unit.test.ts
+++ b/src/test/testing/testController/workspaceTestAdapter.unit.test.ts
@@ -105,15 +105,12 @@ suite('Workspace test adapter', () => {
             sandbox.restore();
         });
 
-        test('If the test provider is unittest, the workspace test adapter uses an instance of UnittestTestDiscoveryAdapter', async () => {
+        test("When discovering tests, the workspace test adapter should call the test discovery adapter's discoverTest method", async () => {
             discoverTestsStub.resolves();
 
-            const workspaceTestAdapter = new WorkspaceTestAdapter(
-                'unittest',
-                Uri.parse('foo'),
-                stubConfigSettings,
-                stubTestServer,
-            );
+            const testDiscoveryAdapter = new UnittestTestDiscoveryAdapter(stubTestServer, stubConfigSettings);
+
+            const workspaceTestAdapter = new WorkspaceTestAdapter('unittest', testDiscoveryAdapter, Uri.parse('foo'));
 
             await workspaceTestAdapter.discoverTests(testController);
 
@@ -131,12 +128,9 @@ suite('Workspace test adapter', () => {
                     }),
             );
 
-            const workspaceTestAdapter = new WorkspaceTestAdapter(
-                'unittest',
-                Uri.parse('foo'),
-                stubConfigSettings,
-                stubTestServer,
-            );
+            const testDiscoveryAdapter = new UnittestTestDiscoveryAdapter(stubTestServer, stubConfigSettings);
+
+            const workspaceTestAdapter = new WorkspaceTestAdapter('unittest', testDiscoveryAdapter, Uri.parse('foo'));
 
             // Try running discovery twice
             const one = workspaceTestAdapter.discoverTests(testController);
@@ -150,12 +144,9 @@ suite('Workspace test adapter', () => {
         test('If discovery succeeds, send a telemetry event with the "failed" key set to false', async () => {
             discoverTestsStub.resolves({ status: 'success' });
 
-            const workspaceTestAdapter = new WorkspaceTestAdapter(
-                'unittest',
-                Uri.parse('foo'),
-                stubConfigSettings,
-                stubTestServer,
-            );
+            const testDiscoveryAdapter = new UnittestTestDiscoveryAdapter(stubTestServer, stubConfigSettings);
+
+            const workspaceTestAdapter = new WorkspaceTestAdapter('unittest', testDiscoveryAdapter, Uri.parse('foo'));
 
             await workspaceTestAdapter.discoverTests(testController);
 
@@ -169,12 +160,9 @@ suite('Workspace test adapter', () => {
         test('If discovery failed, send a telemetry event with the "failed" key set to true, and add an error node to the test controller', async () => {
             discoverTestsStub.rejects(new Error('foo'));
 
-            const workspaceTestAdapter = new WorkspaceTestAdapter(
-                'unittest',
-                Uri.parse('foo'),
-                stubConfigSettings,
-                stubTestServer,
-            );
+            const testDiscoveryAdapter = new UnittestTestDiscoveryAdapter(stubTestServer, stubConfigSettings);
+
+            const workspaceTestAdapter = new WorkspaceTestAdapter('unittest', testDiscoveryAdapter, Uri.parse('foo'));
 
             await workspaceTestAdapter.discoverTests(testController);
 

From 9b2199f8e48066b55904baf9f68d0088582c3fe2 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Tue, 8 Feb 2022 14:05:03 -0800
Subject: [PATCH 79/87] Add a test with decorator #18228

---
 .../.data/utils_decorated_tree.py             | 29 ++++++++++
 .../tests/unittestadapter/test_utils.py       | 55 +++++++++++++++++++
 pythonFiles/unittestadapter/discovery.py      |  5 +-
 3 files changed, 87 insertions(+), 2 deletions(-)
 create mode 100644 pythonFiles/tests/unittestadapter/.data/utils_decorated_tree.py

diff --git a/pythonFiles/tests/unittestadapter/.data/utils_decorated_tree.py b/pythonFiles/tests/unittestadapter/.data/utils_decorated_tree.py
new file mode 100644
index 000000000000..90fdfc89a27b
--- /dev/null
+++ b/pythonFiles/tests/unittestadapter/.data/utils_decorated_tree.py
@@ -0,0 +1,29 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+import unittest
+from functools import wraps
+
+
+def my_decorator(f):
+    @wraps(f)
+    def wrapper(*args, **kwds):
+        print("Calling decorated function")
+        return f(*args, **kwds)
+
+    return wrapper
+
+
+class TreeOne(unittest.TestCase):
+    """Test class for the test_build_decorated_tree test.
+
+    build_test_tree should build a test tree with these test cases.
+    """
+
+    @my_decorator
+    def test_one(self) -> None:
+        self.assertGreater(2, 1)
+
+    @my_decorator
+    def test_two(self) -> None:
+        self.assertNotEqual(2, 1)
diff --git a/pythonFiles/tests/unittestadapter/test_utils.py b/pythonFiles/tests/unittestadapter/test_utils.py
index dc72eb4357f1..cb9a9b3344a7 100644
--- a/pythonFiles/tests/unittestadapter/test_utils.py
+++ b/pythonFiles/tests/unittestadapter/test_utils.py
@@ -208,6 +208,61 @@ def test_build_simple_tree() -> None:
     assert not errors
 
 
+def test_build_decorated_tree() -> None:
+    """The build_test_tree function should build and return a test tree from discovered test suites,
+    with correct line numbers for decorated test,
+    and an empty list of errors if there are none in the discovered data.
+    """
+
+    # Discovery tests in utils_decorated_tree.py.
+    start_dir = os.fsdecode(TEST_DATA_PATH)
+    pattern = "utils_decorated_tree*"
+    file_path = os.fsdecode(pathlib.PurePath(TEST_DATA_PATH, "utils_decorated_tree.py"))
+
+    expected: TestNode = {
+        "path": start_dir,
+        "type_": TestNodeTypeEnum.folder,
+        "name": ".data",
+        "children": [
+            {
+                "name": "utils_decorated_tree.py",
+                "type_": TestNodeTypeEnum.file,
+                "path": file_path,
+                "children": [
+                    {
+                        "name": "TreeOne",
+                        "path": file_path,
+                        "type_": TestNodeTypeEnum.class_,
+                        "children": [
+                            {
+                                "id_": "utils_decorated_tree.TreeOne.test_one",
+                                "name": "test_one",
+                                "path": file_path,
+                                "type_": TestNodeTypeEnum.test,
+                                "lineno": "24",
+                            },
+                            {
+                                "id_": "utils_decorated_tree.TreeOne.test_two",
+                                "name": "test_two",
+                                "path": file_path,
+                                "type_": TestNodeTypeEnum.test,
+                                "lineno": "28",
+                            },
+                        ],
+                    }
+                ],
+            }
+        ],
+    }
+
+    loader = unittest.TestLoader()
+    suite = loader.discover(start_dir, pattern)
+    tests, errors = build_test_tree(suite, start_dir)
+
+    assert is_same_tree(expected, tests)
+    assert not errors
+
+
 def test_build_empty_tree() -> None:
     """The build_test_tree function should return None if there are no discovered test suites, and an empty list of errors if there are none in the discovered data."""
 
diff --git a/pythonFiles/unittestadapter/discovery.py b/pythonFiles/unittestadapter/discovery.py
index de956066123d..7efd6cabb242 100644
--- a/pythonFiles/unittestadapter/discovery.py
+++ b/pythonFiles/unittestadapter/discovery.py
@@ -9,14 +9,15 @@
 import unittest
 from typing import List, Literal, Optional, Tuple, TypedDict, Union
 
-from .utils import TestNode, build_test_tree
-
 # Add the path to pythonFiles to sys.path to find testing_tools.socket_manager.
 PYTHON_FILES = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 sys.path.insert(0, PYTHON_FILES)
 
 from testing_tools import socket_manager
 
+# If I use from utils then there will be an import error in test_discovery.py.
+from unittestadapter.utils import TestNode, build_test_tree
+
 # Add the lib path to sys.path to find the typing_extensions module.
 sys.path.insert(0, os.path.join(PYTHON_FILES, "lib", "python"))
 

From da37ded77578e46a483ac33c3bda9973e2ca1c56 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Tue, 8 Feb 2022 14:05:58 -0800
Subject: [PATCH 80/87] Wrap nodes under test provider

---
 .../testController/workspaceTestAdapter.ts    | 59 ++++++++++---------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/src/client/testing/testController/workspaceTestAdapter.ts b/src/client/testing/testController/workspaceTestAdapter.ts
index b9814948bc03..1aa5e707d88a 100644
--- a/src/client/testing/testController/workspaceTestAdapter.ts
+++ b/src/client/testing/testController/workspaceTestAdapter.ts
@@ -107,36 +107,39 @@ export class WorkspaceTestAdapter {
             // then parse and insert test data.
             testController.items.delete(`DiscoveryError:${workspacePath}`);
 
-            // If we are in a multiroot workspace scenario, find the overall root in the test UI (should be the workspace file name),
-            // then wrap the current folder's test result in a tree under the overall root + the current folder name.
-            let workspaceNode: TestItem | undefined;
-            if (isMultiroot && workspaceFilePath) {
-                const rootFilename = path.basename(workspaceFilePath);
-                workspaceNode = testController.items.get(workspaceFilePath);
-
-                const wrappedTests = rawTestData.tests;
-
-                const children = [
-                    {
-                        path: workspacePath,
-                        name: path.basename(workspacePath),
-                        type_: 'folder' as DiscoveredTestType,
-                        children: wrappedTests ? [wrappedTests] : [],
-                    },
-                ];
-
-                rawTestData.tests = {
-                    path: workspaceFilePath,
-                    name: rootFilename,
-                    type_: 'folder',
-                    children,
-                };
-            } else {
-                // Find the root for this test data in the test controller.
-                const rootPath = rawTestData.cwd;
-                workspaceNode = testController.items.get(rootPath);
+            // Wrap the data under a root node named after the test provider.
+            const wrappedTests = rawTestData.tests;
+
+            // If we are in a multiroot workspace scenario, wrap the current folder's test result in a tree under the overall root + the current folder name.
+            let rootPath = workspacePath;
+            let childrenRootPath = rootPath;
+            let childrenRootName = path.basename(rootPath);
+
+            if (isMultiroot) {
+                rootPath = workspaceFilePath!;
+                childrenRootPath = workspacePath;
+                childrenRootName = path.basename(workspacePath);
             }
 
+            const children = [
+                {
+                    path: childrenRootPath,
+                    name: childrenRootName,
+                    type_: 'folder' as DiscoveredTestType,
+                    children: wrappedTests ? [wrappedTests] : [],
+                },
+            ];
+
+            // Update the raw test data with the wrapped data.
+            rawTestData.tests = {
+                path: rootPath,
+                name: this.testProvider,
+                type_: 'folder',
+                children,
+            };
+
+            const workspaceNode = testController.items.get(rootPath);
+
             if (rawTestData.tests) {
                 // If the test root for this folder exists: Workspace refresh, update its children.
                 // Otherwise, it is a freshly discovered workspace, and we need to create a new test root and populate the test tree.

From 2c5d442b6dc35f379442c15615f44be91b621169 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Tue, 8 Feb 2022 14:15:24 -0800
Subject: [PATCH 81/87] Remove unused localization

---
 package.nls.json                                | 1 -
 src/client/common/utils/localize.ts             | 1 -
 src/client/testing/testController/controller.ts | 1 -
 3 files changed, 3 deletions(-)

diff --git a/package.nls.json b/package.nls.json
index 0f9d0c0fecd0..3d67e792cd5b 100644
--- a/package.nls.json
+++ b/package.nls.json
@@ -76,7 +76,6 @@
     "Common.learnMore": "Learn more",
     "Common.reportThisIssue": "Report this issue",
     "Common.recommended": "Recommended",
-    "Common.workspace": "Workspace",
     "CommonSurvey.remindMeLaterLabel": "Remind me later",
     "CommonSurvey.yesLabel": "Yes, take survey now",
     "CommonSurvey.noLabel": "No, thanks",
diff --git a/src/client/common/utils/localize.ts b/src/client/common/utils/localize.ts
index bc6db354af67..988c5a960859 100644
--- a/src/client/common/utils/localize.ts
+++ b/src/client/common/utils/localize.ts
@@ -88,7 +88,6 @@ export namespace Common {
     export const and = localize('Common.and', 'and');
     export const reportThisIssue = localize('Common.reportThisIssue', 'Report this issue');
     export const recommended = localize('Common.recommended', 'Recommended');
-    export const workspace = localize('Common.workspace', 'Workspace');
     export const clearAll = localize('Common.clearAll', 'Clear all');
 }
 
diff --git a/src/client/testing/testController/controller.ts b/src/client/testing/testController/controller.ts
index a0c33c97f517..588e3b6d9dd1 100644
--- a/src/client/testing/testController/controller.ts
+++ b/src/client/testing/testController/controller.ts
@@ -21,7 +21,6 @@ import { IWorkspaceService } from '../../common/application/types';
 import { IPythonExecutionFactory } from '../../common/process/types';
 import { IConfigurationService, IDisposableRegistry, Resource } from '../../common/types';
 import { DelayedTrigger, IDelayedTrigger } from '../../common/utils/delayTrigger';
-import { Common } from '../../common/utils/localize';
 import { traceVerbose } from '../../logging';
 import { sendTelemetryEvent } from '../../telemetry';
 import { EventName } from '../../telemetry/constants';

From 645c7f8534339cb94ad4b17bc490abbd30df8d7a Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Wed, 9 Feb 2022 15:10:11 -0800
Subject: [PATCH 82/87] Let the OS pick a port

---
 .../testing/testController/common/server.ts   | 12 ++++++++--
 .../testing/testController/controller.ts      |  3 +--
 .../testController/server.unit.test.ts        | 22 +++++++++++--------
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/client/testing/testController/common/server.ts b/src/client/testing/testController/common/server.ts
index 1ae2514c83a3..6ab4e20243c8 100644
--- a/src/client/testing/testController/common/server.ts
+++ b/src/client/testing/testController/common/server.ts
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 import * as http from 'http';
+import * as net from 'net';
 import { v4 as uuidv4 } from 'uuid';
 import { Disposable, Event, EventEmitter } from 'vscode';
 import {
@@ -10,6 +11,7 @@ import {
     SpawnOptions,
 } from '../../../common/process/types';
 import { DataReceivedEvent, ITestServer, TestCommandOptions } from './types';
+import { DEFAULT_TEST_PORT } from './utils';
 
 export class PythonTestServer implements ITestServer, Disposable {
     private _onDataReceived: EventEmitter<DataReceivedEvent> = new EventEmitter<DataReceivedEvent>();
@@ -18,9 +20,13 @@ export class PythonTestServer implements ITestServer, Disposable {
 
     private server: http.Server;
 
-    constructor(private executionFactory: IPythonExecutionFactory, private readonly port: number) {
+    public port: number;
+
+    constructor(private executionFactory: IPythonExecutionFactory) {
         this.uuids = new Map();
 
+        this.port = DEFAULT_TEST_PORT;
+
         const requestListener: http.RequestListener = async (request, response) => {
             const buffers = [];
 
@@ -44,7 +50,9 @@ export class PythonTestServer implements ITestServer, Disposable {
         };
 
         this.server = http.createServer(requestListener);
-        this.server.listen(port);
+        this.server.listen(() => {
+            this.port = (this.server.address() as net.AddressInfo).port;
+        });
     }
 
     public dispose(): void {
diff --git a/src/client/testing/testController/controller.ts b/src/client/testing/testController/controller.ts
index 588e3b6d9dd1..a9bac629e95d 100644
--- a/src/client/testing/testController/controller.ts
+++ b/src/client/testing/testController/controller.ts
@@ -29,7 +29,6 @@ import { TestProvider } from '../types';
 import { PythonTestServer } from './common/server';
 import { DebugTestTag, getNodeByUri, RunTestTag } from './common/testItemUtilities';
 import { ITestController, ITestDiscoveryAdapter, ITestFrameworkController, TestRefreshOptions } from './common/types';
-import { DEFAULT_TEST_PORT } from './common/utils';
 import { UnittestTestDiscoveryAdapter } from './unittest/testDiscoveryAdapter';
 import { WorkspaceTestAdapter } from './workspaceTestAdapter';
 
@@ -105,7 +104,7 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
         );
         this.testController.resolveHandler = this.resolveChildren.bind(this);
 
-        this.pythonTestServer = new PythonTestServer(this.pythonExecFactory, DEFAULT_TEST_PORT);
+        this.pythonTestServer = new PythonTestServer(this.pythonExecFactory);
     }
 
     public async activate(): Promise<void> {
diff --git a/src/test/testing/testController/server.unit.test.ts b/src/test/testing/testController/server.unit.test.ts
index 3ceb8d16f376..c91026f3d326 100644
--- a/src/test/testing/testController/server.unit.test.ts
+++ b/src/test/testing/testController/server.unit.test.ts
@@ -9,10 +9,8 @@ import { OutputChannel, Uri } from 'vscode';
 import { IPythonExecutionFactory, IPythonExecutionService } from '../../../client/common/process/types';
 import { createDeferred } from '../../../client/common/utils/async';
 import { PythonTestServer } from '../../../client/testing/testController/common/server';
-import { DEFAULT_TEST_PORT } from '../../../client/testing/testController/common/utils';
 
 suite('Python Test Server', () => {
-    const port = DEFAULT_TEST_PORT;
     const fakeUuid = 'fake-uuid';
 
     let stubExecutionFactory: IPythonExecutionFactory;
@@ -52,9 +50,10 @@ suite('Python Test Server', () => {
             cwd: '/foo/bar',
         };
 
-        server = new PythonTestServer(stubExecutionFactory, port);
+        server = new PythonTestServer(stubExecutionFactory);
 
         await server.sendCommand(options);
+        const { port } = server;
 
         assert.deepStrictEqual(execArgs, ['myscript', '--port', `${port}`, '--uuid', fakeUuid, '-foo', 'foo']);
     });
@@ -72,12 +71,14 @@ suite('Python Test Server', () => {
             cwd: '/foo/bar',
             outChannel,
         };
-        const expected = ['python', 'myscript', '--port', `${port}`, '--uuid', fakeUuid, '-foo', 'foo'].join(' ');
 
-        server = new PythonTestServer(stubExecutionFactory, port);
+        server = new PythonTestServer(stubExecutionFactory);
 
         await server.sendCommand(options);
 
+        const { port } = server;
+        const expected = ['python', 'myscript', '--port', `${port}`, '--uuid', fakeUuid, '-foo', 'foo'].join(' ');
+
         assert.deepStrictEqual(output, [expected]);
     });
 
@@ -95,7 +96,7 @@ suite('Python Test Server', () => {
             cwd: '/foo/bar',
         };
 
-        server = new PythonTestServer(stubExecutionFactory, port);
+        server = new PythonTestServer(stubExecutionFactory);
         server.onDataReceived(({ data }) => {
             eventData = JSON.parse(data);
         });
@@ -116,7 +117,7 @@ suite('Python Test Server', () => {
 
         let response;
 
-        server = new PythonTestServer(stubExecutionFactory, port);
+        server = new PythonTestServer(stubExecutionFactory);
         server.onDataReceived(({ data }) => {
             response = data;
             deferred.resolve();
@@ -125,6 +126,7 @@ suite('Python Test Server', () => {
         await server.sendCommand(options);
 
         // Send data back.
+        const { port } = server;
         const requestOptions = {
             hostname: 'localhost',
             method: 'POST',
@@ -153,7 +155,7 @@ suite('Python Test Server', () => {
 
         let response;
 
-        server = new PythonTestServer(stubExecutionFactory, port);
+        server = new PythonTestServer(stubExecutionFactory);
         server.onDataReceived(({ data }) => {
             response = data;
             deferred.resolve();
@@ -162,6 +164,7 @@ suite('Python Test Server', () => {
         await server.sendCommand(options);
 
         // Send data back.
+        const { port } = server;
         const requestOptions = {
             hostname: 'localhost',
             method: 'POST',
@@ -190,7 +193,7 @@ suite('Python Test Server', () => {
 
         let response;
 
-        server = new PythonTestServer(stubExecutionFactory, port);
+        server = new PythonTestServer(stubExecutionFactory);
         server.onDataReceived(({ data }) => {
             response = data;
             deferred.resolve();
@@ -199,6 +202,7 @@ suite('Python Test Server', () => {
         await server.sendCommand(options);
 
         // Send data back.
+        const { port } = server;
         const requestOptions = {
             hostname: 'localhost',
             method: 'POST',

From 5ac4deaeb0d99304a6de1617bb46f13beed0285a Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Wed, 9 Feb 2022 16:04:30 -0800
Subject: [PATCH 83/87] traceLog when response processing errors out

---
 .../testing/testController/common/server.ts   | 30 ++++++++------
 .../testController/server.unit.test.ts        | 41 +++++++++++++++++++
 2 files changed, 59 insertions(+), 12 deletions(-)

diff --git a/src/client/testing/testController/common/server.ts b/src/client/testing/testController/common/server.ts
index 6ab4e20243c8..08a2ac7aba1c 100644
--- a/src/client/testing/testController/common/server.ts
+++ b/src/client/testing/testController/common/server.ts
@@ -10,6 +10,7 @@ import {
     IPythonExecutionFactory,
     SpawnOptions,
 } from '../../../common/process/types';
+import { traceLog } from '../../../logging';
 import { DataReceivedEvent, ITestServer, TestCommandOptions } from './types';
 import { DEFAULT_TEST_PORT } from './utils';
 
@@ -30,22 +31,27 @@ export class PythonTestServer implements ITestServer, Disposable {
         const requestListener: http.RequestListener = async (request, response) => {
             const buffers = [];
 
-            for await (const chunk of request) {
-                buffers.push(chunk);
-            }
+            try {
+                for await (const chunk of request) {
+                    buffers.push(chunk);
+                }
 
-            const data = Buffer.concat(buffers).toString();
+                const data = Buffer.concat(buffers).toString();
 
-            response.end();
+                response.end();
 
-            const { uuid } = JSON.parse(data);
+                const { uuid } = JSON.parse(data);
 
-            // Check if the uuid we received exists in the list of active ones.
-            // If yes, process the response, if not, ignore it.
-            const cwd = this.uuids.get(uuid);
-            if (cwd) {
-                this._onDataReceived.fire({ cwd, data });
-                this.uuids.delete(uuid);
+                // Check if the uuid we received exists in the list of active ones.
+                // If yes, process the response, if not, ignore it.
+                const cwd = this.uuids.get(uuid);
+                if (cwd) {
+                    this._onDataReceived.fire({ cwd, data });
+                    this.uuids.delete(uuid);
+                }
+            } catch (ex) {
+                traceLog(`Error processing test server request: ${ex}`);
+                this._onDataReceived.fire({ cwd: '', data: '' });
             }
         };
 
diff --git a/src/test/testing/testController/server.unit.test.ts b/src/test/testing/testController/server.unit.test.ts
index c91026f3d326..da57975b5de2 100644
--- a/src/test/testing/testController/server.unit.test.ts
+++ b/src/test/testing/testController/server.unit.test.ts
@@ -9,6 +9,7 @@ import { OutputChannel, Uri } from 'vscode';
 import { IPythonExecutionFactory, IPythonExecutionService } from '../../../client/common/process/types';
 import { createDeferred } from '../../../client/common/utils/async';
 import { PythonTestServer } from '../../../client/testing/testController/common/server';
+import * as logging from '../../../client/logging';
 
 suite('Python Test Server', () => {
     const fakeUuid = 'fake-uuid';
@@ -19,10 +20,12 @@ suite('Python Test Server', () => {
     let sandbox: sinon.SinonSandbox;
     let execArgs: string[];
     let v4Stub: sinon.SinonStub;
+    let traceLogStub: sinon.SinonStub;
 
     setup(() => {
         sandbox = sinon.createSandbox();
         v4Stub = sandbox.stub(uuid, 'v4');
+        traceLogStub = sandbox.stub(logging, 'traceLog');
 
         v4Stub.returns(fakeUuid);
         stubExecutionService = ({
@@ -144,6 +147,44 @@ suite('Python Test Server', () => {
 
         assert.deepStrictEqual(response, postData);
     });
+    test('If the server receives malformed data, it should display a log message, and not fire an event', async () => {
+        const deferred = createDeferred();
+        const options = {
+            command: { script: 'myscript', args: ['-foo', 'foo'] },
+            workspaceFolder: Uri.file('/foo/bar'),
+            cwd: '/foo/bar',
+        };
+
+        let response;
+
+        server = new PythonTestServer(stubExecutionFactory);
+        server.onDataReceived(({ data }) => {
+            response = data;
+            deferred.resolve();
+        });
+
+        await server.sendCommand(options);
+
+        // Send data back.
+        const { port } = server;
+        const requestOptions = {
+            hostname: 'localhost',
+            method: 'POST',
+            port,
+        };
+
+        const request = http.request(requestOptions, (res) => {
+            res.setEncoding('utf8');
+        });
+        const postData = '[test';
+        request.write(postData);
+        request.end();
+
+        await deferred.promise;
+
+        sinon.assert.calledOnce(traceLogStub);
+        assert.deepStrictEqual(response, '');
+    });
 
     test('If the server receives data, it should not fire an event if it is an unknown uuid', async () => {
         const deferred = createDeferred();

From f01abcf802ca6dbb838df9359f9dd157718d3b57 Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <51720070+kimadeline@users.noreply.github.com>
Date: Wed, 9 Feb 2022 16:06:08 -0800
Subject: [PATCH 84/87] Update pythonFiles/unittestadapter/utils.py

Co-authored-by: Brett Cannon <brett@python.org>
---
 pythonFiles/unittestadapter/utils.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pythonFiles/unittestadapter/utils.py b/pythonFiles/unittestadapter/utils.py
index 207bff2d27b5..40aa802df3a1 100644
--- a/pythonFiles/unittestadapter/utils.py
+++ b/pythonFiles/unittestadapter/utils.py
@@ -62,6 +62,7 @@ def get_source_line(obj) -> str:
     for i, v in enumerate(sourcelines):
         if v.strip().startswith(("def", "async def")):
             return str(lineno + i)
+
     return "*"
 
 

From 62e7f38622cda54de4bc775c1b68bb925222a28b Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Wed, 13 Apr 2022 10:58:53 -0700
Subject: [PATCH 85/87] Fix compilation errors

---
 src/client/testing/testController/common/server.ts          | 2 +-
 .../testController/workspaceTestAdapter.unit.test.ts        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/client/testing/testController/common/server.ts b/src/client/testing/testController/common/server.ts
index 08a2ac7aba1c..19fcf1330baf 100644
--- a/src/client/testing/testController/common/server.ts
+++ b/src/client/testing/testController/common/server.ts
@@ -104,7 +104,7 @@ export class PythonTestServer implements ITestServer, Disposable {
                 cwd: options.cwd,
                 data: JSON.stringify({
                     status: 'error',
-                    errors: [ex.message],
+                    errors: [(ex as Error).message],
                 }),
             });
         }
diff --git a/src/test/testing/testController/workspaceTestAdapter.unit.test.ts b/src/test/testing/testController/workspaceTestAdapter.unit.test.ts
index b0af0393a9ca..7b94d73aea6d 100644
--- a/src/test/testing/testController/workspaceTestAdapter.unit.test.ts
+++ b/src/test/testing/testController/workspaceTestAdapter.unit.test.ts
@@ -85,12 +85,12 @@ suite('Workspace test adapter', () => {
 
             const mockSendTelemetryEvent = (
                 eventName: EventName,
-                _: number | undefined,
-                properties: Record<string, unknown>,
+                _: number | Record<string, number> | undefined,
+                properties: unknown,
             ) => {
                 telemetryEvent.push({
                     eventName,
-                    properties,
+                    properties: properties as Record<string, unknown>,
                 });
             };
 

From e921d28d954acdeabc3d2d90236e1de5fcee074e Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Wed, 13 Apr 2022 11:15:47 -0700
Subject: [PATCH 86/87] angery

---
 src/client/testing/testController/controller.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/testing/testController/controller.ts b/src/client/testing/testController/controller.ts
index 9df7d8030e1f..6e38722ee30a 100644
--- a/src/client/testing/testController/controller.ts
+++ b/src/client/testing/testController/controller.ts
@@ -197,7 +197,7 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
 
                 // Ensure we send test telemetry if it gets disabled again
                 this.sendTestDisabledTelemetry = true;
-              
+
                 await this.unittest.refreshTestData(this.testController, uri, this.refreshCancellation.token);
             } else {
                 if (this.sendTestDisabledTelemetry) {

From af80b41d87f9337d7968523dcc5c61b486d5dbbd Mon Sep 17 00:00:00 2001
From: Kim-Adeline Miguel <kimiguel@microsoft.com>
Date: Wed, 13 Apr 2022 13:06:41 -0700
Subject: [PATCH 87/87] Use crypto.randomUUID() instead of uuid.v4()

---
 src/client/testing/testController/common/server.ts  | 4 ++--
 src/test/testing/testController/server.unit.test.ts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/client/testing/testController/common/server.ts b/src/client/testing/testController/common/server.ts
index 19fcf1330baf..9193275a1a21 100644
--- a/src/client/testing/testController/common/server.ts
+++ b/src/client/testing/testController/common/server.ts
@@ -3,7 +3,7 @@
 
 import * as http from 'http';
 import * as net from 'net';
-import { v4 as uuidv4 } from 'uuid';
+import * as crypto from 'crypto';
 import { Disposable, Event, EventEmitter } from 'vscode';
 import {
     ExecutionFactoryCreateWithEnvironmentOptions,
@@ -71,7 +71,7 @@ export class PythonTestServer implements ITestServer, Disposable {
     }
 
     async sendCommand(options: TestCommandOptions): Promise<void> {
-        const uuid = uuidv4();
+        const uuid = crypto.randomUUID();
         const spawnOptions: SpawnOptions = {
             token: options.token,
             cwd: options.cwd,
diff --git a/src/test/testing/testController/server.unit.test.ts b/src/test/testing/testController/server.unit.test.ts
index da57975b5de2..56209fbbf554 100644
--- a/src/test/testing/testController/server.unit.test.ts
+++ b/src/test/testing/testController/server.unit.test.ts
@@ -4,7 +4,7 @@
 import * as assert from 'assert';
 import * as http from 'http';
 import * as sinon from 'sinon';
-import * as uuid from 'uuid';
+import * as crypto from 'crypto';
 import { OutputChannel, Uri } from 'vscode';
 import { IPythonExecutionFactory, IPythonExecutionService } from '../../../client/common/process/types';
 import { createDeferred } from '../../../client/common/utils/async';
@@ -24,7 +24,7 @@ suite('Python Test Server', () => {
 
     setup(() => {
         sandbox = sinon.createSandbox();
-        v4Stub = sandbox.stub(uuid, 'v4');
+        v4Stub = sandbox.stub(crypto, 'randomUUID');
         traceLogStub = sandbox.stub(logging, 'traceLog');
 
         v4Stub.returns(fakeUuid);