small edits for review

Author: eleanorjboyd

pythonFiles/tests/unittestadapter/test_execution.py

@@ -8,9 +8,9 @@
 
 import pytest
 
-PYTHON_FILES = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+PYTHON_FILES = pathlib.Path(__file__).parent.parent
 
-sys.path.insert(0, PYTHON_FILES)
+sys.path.insert(0, os.fspath(PYTHON_FILES))
 from unittestadapter.execution import parse_execution_cli_args, run_tests
 
 TEST_DATA_PATH = pathlib.Path(__file__).parent / ".data"

pythonFiles/unittestadapter/discovery.py

@@ -17,8 +17,8 @@
 from typing_extensions import Literal
 
 # 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)
+PYTHON_FILES = pathlib.Path(__file__).parent.parent
+sys.path.insert(0, os.fspath(PYTHON_FILES))
 
 from testing_tools import socket_manager
 

pythonFiles/unittestadapter/execution.py

@@ -15,9 +15,9 @@
 
 directory_path = pathlib.Path(__file__).parent.parent / "lib" / "python"
 # 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__)))
+PYTHON_FILES = pathlib.Path(__file__).parent.parent
 
-sys.path.insert(0, PYTHON_FILES)
+sys.path.insert(0, os.fspath(PYTHON_FILES))
 # 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 process_json_util, socket_manager

pythonFiles/vscode_pytest/__init__.py

@@ -173,7 +173,6 @@ def pytest_report_teststatus(report, config):
                 "success",
                 collected_test if collected_test else None,
             )
-        # collected_tests[report.nodeid] = item_result
 
 
 ERROR_MESSAGE_CONST = {

src/client/testing/testController/unittest/testDiscoveryAdapter.ts

@@ -29,7 +29,6 @@ export class UnittestTestDiscoveryAdapter implements ITestDiscoveryAdapter {
     ) {}
 
     public async discoverTests(uri: Uri): Promise<DiscoveredTestPayload> {
-        // const deferred = createDeferred<DiscoveredTestPayload>();
         const settings = this.configSettings.getSettings(uri);
         const { unittestArgs } = settings.testing;
 
@@ -54,8 +53,6 @@ export class UnittestTestDiscoveryAdapter implements ITestDiscoveryAdapter {
         } finally {
             this.testServer.deleteUUID(uuid);
             disposable.dispose();
-            // deferred.resolve();
-            // confirm with testing that this gets called (it must clean this up)
         }
         // placeholder until after the rewrite is adopted
         // TODO: remove after adoption.