microsoft · anthonykim1 · Aug 1, 2022 · Jun 29, 2022 · Jun 30, 2022 · Jul 5, 2022
diff --git a/pythonFiles/tests/unittestadapter/test_discovery.py b/pythonFiles/tests/unittestadapter/test_discovery.py
@@ -10,9 +10,8 @@
     DEFAULT_PORT,
     discover_tests,
     parse_discovery_cli_args,
-    parse_unittest_discovery_args,
 )
-from unittestadapter.utils import TestNodeTypeEnum
+from unittestadapter.utils import TestNodeTypeEnum, parse_unittest_args
 
 from .helpers import TEST_DATA_PATH, is_same_tree
 
@@ -68,7 +67,7 @@ def test_parse_unittest_args(args: List[str], expected: List[str]) -> 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.
     """
-    actual = parse_unittest_discovery_args(args)
+    actual = parse_unittest_args(args)
 
     assert actual == expected
 
@@ -132,7 +131,6 @@ def test_simple_discovery() -> None:
     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
 
@@ -148,7 +146,6 @@ def test_empty_discovery() -> None:
     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
 
@@ -215,6 +212,5 @@ def test_error_discovery() -> None:
     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
diff --git a/pythonFiles/tests/unittestadapter/test_utils.py b/pythonFiles/tests/unittestadapter/test_utils.py
@@ -195,13 +195,15 @@ def test_build_simple_tree() -> None:
                                 "type_": TestNodeTypeEnum.test,
                                 "lineno": "13",
                                 "id_": file_path + "\\" + "TreeOne" + "\\" + "test_one",
+                                "runID": "utils_simple_tree.TreeOne.test_one",
                             },
                             {
                                 "name": "test_two",
                                 "path": file_path,
                                 "type_": TestNodeTypeEnum.test,
                                 "lineno": "16",
                                 "id_": file_path + "\\" + "TreeOne" + "\\" + "test_two",
+                                "runID": "utils_simple_tree.TreeOne.test_two",
                             },
                         ],
                         "id_": file_path + "\\" + "TreeOne",
@@ -253,13 +255,15 @@ def test_build_decorated_tree() -> None:
                                 "type_": TestNodeTypeEnum.test,
                                 "lineno": "24",
                                 "id_": file_path + "\\" + "TreeOne" + "\\" + "test_one",
+                                "runID": "utils_decorated_tree.TreeOne.test_one",
                             },
                             {
                                 "name": "test_two",
                                 "path": file_path,
                                 "type_": TestNodeTypeEnum.test,
                                 "lineno": "28",
                                 "id_": file_path + "\\" + "TreeOne" + "\\" + "test_two",
+                                "runID": "utils_decorated_tree.TreeOne.test_two",
                             },
                         ],
                         "id_": file_path + "\\" + "TreeOne",

diff --git a/pythonFiles/unittestadapter/discovery.py b/pythonFiles/unittestadapter/discovery.py
@@ -17,7 +17,7 @@
 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
+from unittestadapter.utils import TestNode, build_test_tree, parse_unittest_args
 
 # Add the lib path to sys.path to find the typing_extensions module.
 sys.path.insert(0, os.path.join(PYTHON_FILES, "lib", "python"))
@@ -44,35 +44,8 @@ def parse_discovery_cli_args(args: List[str]) -> Tuple[int, Union[str, None]]:
     return int(parsed_args.port), parsed_args.uuid
 
 
-def parse_unittest_discovery_args(args: List[str]) -> Tuple[str, str, Union[str, None]]:
-    """Parse command-line arguments that should be forwarded to unittest to perform discovery.
-
-    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.
-    """
-
-    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,
-    )
-
-
 class PayloadDict(TypedDict):
     cwd: str
-    uuid: Union[str, None]
     status: Literal["success", "error"]
     tests: NotRequired[TestNode]
     errors: NotRequired[List[str]]
@@ -112,7 +85,7 @@ def discover_tests(
     }
     """
     cwd = os.path.abspath(start_dir)
-    payload: PayloadDict = {"cwd": cwd, "status": "success", "uuid": uuid}
+    payload: PayloadDict = {"cwd": cwd, "status": "success"}
     tests = None
     errors: List[str] = []
 
@@ -140,7 +113,7 @@ def discover_tests(
     argv = sys.argv[1:]
     index = argv.index("--udiscovery")
 
-    start_dir, pattern, top_level_dir = parse_unittest_discovery_args(argv[index + 1 :])
+    start_dir, pattern, top_level_dir = parse_unittest_args(argv[index + 1 :])
 
     # Perform test discovery.
     port, uuid = parse_discovery_cli_args(argv[:index])
@@ -154,6 +127,7 @@ def discover_tests(
 Host: localhost:{port}
 Content-Length: {len(data)}
 Content-Type: application/json
+Request-uuid: {uuid}
 
 {data}"""
         result = s.socket.sendall(request.encode("utf-8"))  # type: ignore
diff --git a/pythonFiles/unittestadapter/execution.py b/pythonFiles/unittestadapter/execution.py
@@ -11,18 +11,14 @@
 from types import TracebackType
 from typing import Dict, List, Optional, Tuple, Type, TypeAlias, TypedDict
 
-from typing_extensions import NotRequired
-
-from .discovery import parse_unittest_discovery_args
-
 # 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
-
 # 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 testing_tools import socket_manager
+from typing_extensions import NotRequired
+from unittestadapter.utils import parse_unittest_args
 
 DEFAULT_PORT = "45454"
 
@@ -41,15 +37,13 @@ def parse_execution_cli_args(args: List[str]) -> Tuple[int, str | None, List[str
     arg_parser = argparse.ArgumentParser()
     arg_parser.add_argument("--port", default=DEFAULT_PORT)
     arg_parser.add_argument("--uuid")
-    arg_parser.add_argument("--testids")
+    arg_parser.add_argument("--testids", nargs="+")
     parsed_args, _ = arg_parser.parse_known_args(args)
 
-    test_ids: List[str] = parsed_args.testids.split(",") if parsed_args.testids else []
-
-    return (int(parsed_args.port), parsed_args.uuid, test_ids)
+    return (int(parsed_args.port), parsed_args.uuid, parsed_args.testids)
 
 
-ErrorType: TypeAlias = (
+ErrorType = (
     Tuple[Type[BaseException], BaseException, TracebackType] | Tuple[None, None, None]
 )
 
@@ -66,6 +60,7 @@ class TestOutcomeEnum(str, enum.Enum):
 
 
 class UnittestTestResult(unittest.TextTestResult):
+
     formatted: Dict[str, Dict[str, str | None]] = dict()
 
     def startTest(self, test: unittest.TestCase):
@@ -152,7 +147,6 @@ class TestExecutionStatus(str, enum.Enum):
 
 class PayloadDict(TypedDict):
     cwd: str
-    uuid: str | None
     status: TestExecutionStatus
     result: NotRequired[TestResultTypeAlias]
     not_found: NotRequired[List[str]]
@@ -167,14 +161,14 @@ class PayloadDict(TypedDict):
 def run_tests(
     start_dir: str,
     test_ids: List[str],
-    pattern: Optional[str],
+    pattern: str,
     top_level_dir: Optional[str],
     uuid: Optional[str],
 ) -> PayloadDict:
     cwd = os.path.abspath(start_dir)
-    status = TestExecutionStatus.success
+    status = TestExecutionStatus.error
     error = None
-    payload: PayloadDict = {"cwd": cwd, "uuid": uuid, "status": status}
+    payload: PayloadDict = {"cwd": cwd, "status": status}
 
     try:
         # If it's a file, split path and file name.
@@ -191,20 +185,17 @@ def run_tests(
             "pattern": pattern,
             "top_level_dir": top_level_dir,
         }
-        suite = loader.discover(**{k: v for k, v in args.items() if v is not None})
+        suite = loader.discover(start_dir, pattern, top_level_dir)
 
         # Run tests.
         runner = unittest.TextTestRunner(resultclass=UnittestTestResult)
-        result: UnittestTestResult = runner.run(suite)  # type: ignore
+        # lets try to tailer our own suite so we can figure out running only the ones we want
+        loader = unittest.TestLoader()
+        tailor: unittest.TestSuite = loader.loadTestsFromNames(test_ids)
+        result: UnittestTestResult = runner.run(tailor)  # type: ignore
 
-        # Filter tests by id.
-        filtered_results = {k: v for k, v in result.formatted.items() if k in test_ids}
-        payload["result"] = filtered_results
+        payload["result"] = result.formatted
 
-        # Add a payload entry with the list of test ids for tests that weren't found.
-        not_found = set(test_ids) - set(filtered_results.keys())
-        if not_found:
-            payload["not_found"] = list(not_found)
     except Exception:
         status = TestExecutionStatus.error
         error = traceback.format_exc()
@@ -214,7 +205,7 @@ def run_tests(
 
     payload["status"] = status
 
-    print(f"payload: \n{json.dumps(payload, indent=4)}")
+    # print(f"payload: \n{json.dumps(payload, indent=4)}")
 
     return payload
 
@@ -224,29 +215,21 @@ def run_tests(
     argv = sys.argv[1:]
     index = argv.index("--udiscovery")
 
-    start_dir, pattern, top_level_dir = parse_unittest_discovery_args(argv[index + 1 :])
-
-    # start_path = pathlib.Path.home() / "Documents" / "Sandbox" / "unittest-subtest"
-    # test_ids = [
-    #     "subfolder.test_two.TestClassTwo.test_two_two",
-    #     "test_one.TestClassOne.test_func_one",
-    #     "test_eight.TestClassEight.test_func_eight",
-    # ]
-    # uuid = "abcd"
+    start_dir, pattern, top_level_dir = parse_unittest_args(argv[index + 1 :])
 
     # Perform test execution.
-    port, uuid, test_ids = parse_execution_cli_args(argv[:index])
-    run_tests(start_dir, test_ids, 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
-# Host: localhost:{port}
-# Content-Length: {len(data)}
-# Content-Type: application/json
-
-# {data}"""
-#         result = s.socket.sendall(request.encode("utf-8"))  # type: ignore
+    port, uuid, testids = parse_execution_cli_args(argv[:index])
+    payload = run_tests(start_dir, testids, 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
+Host: localhost:{port}
+Content-Length: {len(data)}
+Content-Type: application/json
+Request-uuid: {uuid}
+
+{data}"""
+        result = s.socket.sendall(request.encode("utf-8"))  # type: ignore
diff --git a/pythonFiles/unittestadapter/utils.py b/pythonFiles/unittestadapter/utils.py
@@ -1,6 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
+import argparse
 import enum
 import inspect
 import os
@@ -28,6 +29,7 @@ class TestData(TypedDict):
 
 class TestItem(TestData):
     lineno: str
+    runID: str
 
 
 class TestNode(TestData):
@@ -190,10 +192,37 @@ def build_test_tree(
                 "lineno": lineno,
                 "type_": TestNodeTypeEnum.test,
                 "id_": file_path + "\\" + class_name + "\\" + function_name,
+                "runID": test_id,
             }  # concatenate class name and function test name
             current_node["children"].append(test_node)
 
     if not root["children"]:
         root = None
 
     return root, errors
+
+
+def parse_unittest_args(args: List[str]) -> Tuple[str, str, Union[str, None]]:
+    """Parse command-line arguments that should be forwarded to unittest to perform discovery.
+
+    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.
+    """
+
+    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,
+    )
diff --git a/src/client/common/process/internal/scripts/index.ts b/src/client/common/process/internal/scripts/index.ts
@@ -138,6 +138,13 @@ export function visualstudio_py_testlauncher(testArgs: string[]): string[] {
     return [script, ...testArgs];
 }
 
+// execution.py
+// eslint-disable-next-line camelcase
+export function execution_py_testlauncher(testArgs: string[]): string[] {
+    const script = path.join(SCRIPTS_DIR, 'unittestadapter', 'execution.py');
+    return [script, ...testArgs];
+}
+
 // tensorboard_launcher.py
 
 export function tensorboardLauncher(args: string[]): string[] {

diff --git a/src/client/common/utils/localize.ts b/src/client/common/utils/localize.ts
@@ -514,6 +514,11 @@ export namespace Testing {
     );
     export const errorUnittestDiscovery = localize('Testing.errorUnittestDiscovery', 'Unittest test discovery error');
     export const seePythonOutput = localize('Testing.seePythonOutput', '(see Output > Python)');
+    export const cancelUnittestExecution = localize(
+        'Testing.cancelUnittestExecution',
+        'Canceled unittest test execution',
+    );
+    export const errorUnittestExecution = localize('Testing.errorUnittestExecution', 'Unittest test execution error');
 }
 
 export namespace OutdatedDebugger {

diff --git a/src/client/testing/common/debugLauncher.ts b/src/client/testing/common/debugLauncher.ts
@@ -211,7 +211,8 @@ export class DebugLauncher implements ITestDebugLauncher {
     private getTestLauncherScript(testProvider: TestProvider) {
         switch (testProvider) {
             case 'unittest': {
-                return internalScripts.visualstudio_py_testlauncher;
+                return internalScripts.visualstudio_py_testlauncher; // old way unittest execution, debugger
+                // return internalScripts.execution_py_testlauncher; // this is the new way to run unittest execution, debugger
             }
             case 'pytest': {
                 return internalScripts.testlauncher;