remove incorrect implementation

Author: eleanorjboyd

python_files/vscode_pytest/__init__.py

@@ -10,14 +10,7 @@
 import pathlib
 import sys
 import traceback
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Dict,
-    Generator,
-    Literal,
-    TypedDict,
-)
+from typing import TYPE_CHECKING, Any, Dict, Generator, Literal, TypedDict
 
 import pytest
 
@@ -265,7 +258,7 @@ def pytest_report_teststatus(report, config):  # noqa: ARG001
     if SYMLINK_PATH:
         cwd = SYMLINK_PATH
 
-    if report.when == "call":
+    if report.when == "call" or (report.when == "setup" and report.skipped):
         traceback = None
         message = None
         report_value = "skipped"
@@ -278,19 +271,8 @@ def pytest_report_teststatus(report, config):  # noqa: ARG001
             node_path = map_id_to_path[report.nodeid]
         except KeyError:
             node_path = cwd
-
+        # Calculate the absolute test id and use this as the ID moving forward.
         absolute_node_id = get_absolute_test_id(report.nodeid, node_path)
-        parent_test_name = report.nodeid.split("::")[-1]
-        if report.head_line and report.head_line != parent_test_name:
-            # add parent node to collected_tests_so_far to not double report
-            collected_tests_so_far.append(absolute_node_id)
-            # If the report has a head_line, then it is a pytest-subtest
-            # and we need to adjust the nodeid to reflect the subtest.
-            if report_value == "failure":
-                report_value = "subtest-failure"
-            elif report_value == "success":
-                report_value = "subtest-success"
-            absolute_node_id = absolute_node_id + "**{" + report.head_line + "}**"
         if absolute_node_id not in collected_tests_so_far:
             collected_tests_so_far.append(absolute_node_id)
             item_result = create_test_outcome(
@@ -453,7 +435,11 @@ def pytest_sessionfinish(session, exitstatus):
     if is_coverage_run == "True":
         # load the report and build the json result to return
         import coverage
-        from coverage import exceptions
+
+        try:
+            from coverage.exceptions import NoSource
+        except ImportError:
+            from coverage.misc import NoSource
 
         cov = coverage.Coverage()
         cov.load()
@@ -464,16 +450,16 @@ def pytest_sessionfinish(session, exitstatus):
         # remove files omitted per coverage report config if any
         omit_files = cov.config.report_omit
         if omit_files:
-            omit_files = set(omit_files)
-            # convert to absolute paths, check against file set
-            omit_files = {os.fspath(pathlib.Path(file).absolute()) for file in omit_files}
-            print("Files to omit from reporting", omit_files)
-            file_set = file_set - omit_files
+            print("Plugin info[vscode-pytest]: Omit files/rules: ", omit_files)
+            for pattern in omit_files:
+                for file in list(file_set):
+                    if pathlib.Path(file).match(pattern):
+                        file_set.remove(file)
 
         for file in file_set:
             try:
                 analysis = cov.analysis2(file)
-            except exceptions.NoSource:
+            except NoSource:
                 # as per issue 24308 this best way to handle this edge case
                 continue
             lines_executable = {int(line_no) for line_no in analysis[1]}
@@ -502,7 +488,7 @@ def build_test_tree(session: pytest.Session) -> TestNode:
     """
     session_node = create_session_node(session)
     session_children_dict: dict[str, TestNode] = {}
-    file_nodes_dict: dict[Any, TestNode] = {}
+    file_nodes_dict: dict[str, TestNode] = {}
     class_nodes_dict: dict[str, TestNode] = {}
     function_nodes_dict: dict[str, TestNode] = {}
 
@@ -551,11 +537,13 @@ def build_test_tree(session: pytest.Session) -> TestNode:
                 function_test_node["children"].append(test_node)
             # Check if the parent node of the function is file, if so create/add to this file node.
             if isinstance(test_case.parent, pytest.File):
+                # calculate the parent path of the test case
+                parent_path = get_node_path(test_case.parent)
                 try:
-                    parent_test_case = file_nodes_dict[test_case.parent]
+                    parent_test_case = file_nodes_dict[os.fspath(parent_path)]
                 except KeyError:
-                    parent_test_case = create_file_node(test_case.parent)
-                    file_nodes_dict[test_case.parent] = parent_test_case
+                    parent_test_case = create_file_node(parent_path)
+                    file_nodes_dict[os.fspath(parent_path)] = parent_test_case
                 if function_test_node not in parent_test_case["children"]:
                     parent_test_case["children"].append(function_test_node)
             # If the parent is not a file, it is a class, add the function node as the test node to handle subsequent nesting.
@@ -587,22 +575,24 @@ def build_test_tree(session: pytest.Session) -> TestNode:
             else:
                 ERRORS.append(f"Test class {case_iter} has no parent")
                 break
+            parent_path = get_node_path(parent_module)
             # Create a file node that has the last class as a child.
             try:
-                test_file_node: TestNode = file_nodes_dict[parent_module]
+                test_file_node: TestNode = file_nodes_dict[os.fspath(parent_path)]
             except KeyError:
-                test_file_node = create_file_node(parent_module)
-                file_nodes_dict[parent_module] = test_file_node
+                test_file_node = create_file_node(parent_path)
+                file_nodes_dict[os.fspath(parent_path)] = test_file_node
             # Check if the class is already a child of the file node.
             if test_class_node is not None and test_class_node not in test_file_node["children"]:
                 test_file_node["children"].append(test_class_node)
         elif not hasattr(test_case, "callspec"):
             # This includes test cases that are pytest functions or a doctests.
+            parent_path = get_node_path(test_case.parent)
             try:
-                parent_test_case = file_nodes_dict[test_case.parent]
+                parent_test_case = file_nodes_dict[os.fspath(parent_path)]
             except KeyError:
-                parent_test_case = create_file_node(test_case.parent)
-                file_nodes_dict[test_case.parent] = parent_test_case
+                parent_test_case = create_file_node(parent_path)
+                file_nodes_dict[os.fspath(parent_path)] = parent_test_case
             parent_test_case["children"].append(test_node)
     created_files_folders_dict: dict[str, TestNode] = {}
     for file_node in file_nodes_dict.values():
@@ -760,18 +750,17 @@ def create_parameterized_function_node(
     }
 
 
-def create_file_node(file_module: Any) -> TestNode:
-    """Creates a file node from a pytest file module.
+def create_file_node(calculated_node_path: pathlib.Path) -> TestNode:
+    """Creates a file node from a path which has already been calculated using the get_node_path function.
 
     Keyword arguments:
-    file_module -- the pytest file module.
+    calculated_node_path -- the pytest file path.
     """
-    node_path = get_node_path(file_module)
     return {
-        "name": node_path.name,
-        "path": node_path,
+        "name": calculated_node_path.name,
+        "path": calculated_node_path,
         "type_": "file",
-        "id_": os.fspath(node_path),
+        "id_": os.fspath(calculated_node_path),
         "children": [],
     }
 
@@ -930,7 +919,7 @@ def send_message(
 
     if __writer is None:
         try:
-            __writer = open(TEST_RUN_PIPE, "w", encoding="utf-8", newline="\r\n")  # noqa: SIM115, PTH123
+            __writer = open(TEST_RUN_PIPE, "wb")  # noqa: SIM115, PTH123
         except Exception as error:
             error_msg = f"Error attempting to connect to extension named pipe {TEST_RUN_PIPE}[vscode-pytest]: {error}"
             print(error_msg, file=sys.stderr)
@@ -950,9 +939,16 @@ def send_message(
     data = json.dumps(rpc, cls=cls_encoder)
     try:
         if __writer:
-            request = f"""content-length: {len(data)}\ncontent-type: application/json\n\n{data}"""
-            __writer.write(request)
-            __writer.flush()
+            request = (
+                f"""content-length: {len(data)}\r\ncontent-type: application/json\r\n\r\n{data}"""
+            )
+            size = 4096
+            encoded = request.encode("utf-8")
+            bytes_written = 0
+            while bytes_written < len(encoded):
+                segment = encoded[bytes_written : bytes_written + size]
+                bytes_written += __writer.write(segment)
+                __writer.flush()
         else:
             print(
                 f"Plugin error connection error[vscode-pytest], writer is None \n[vscode-pytest] data: \n{data} \n",

src/client/testing/testController/common/resultResolver.ts

@@ -189,8 +189,10 @@ export class PythonResultResolver implements ITestResultResolver {
                     // search through freshly built array of testItem to find the failed test and update UI.
                     testCases.forEach((indiItem) => {
                         if (indiItem.id === grabVSid) {
-                            if (indiItem.uri && indiItem.range) {
-                                message.location = new Location(indiItem.uri, indiItem.range);
+                            if (indiItem.uri) {
+                                if (indiItem.range) {
+                                    message.location = new Location(indiItem.uri, indiItem.range);
+                                }
                                 runInstance.errored(indiItem, message);
                             }
                         }
@@ -210,8 +212,10 @@ export class PythonResultResolver implements ITestResultResolver {
                     // search through freshly built array of testItem to find the failed test and update UI.
                     testCases.forEach((indiItem) => {
                         if (indiItem.id === grabVSid) {
-                            if (indiItem.uri && indiItem.range) {
-                                message.location = new Location(indiItem.uri, indiItem.range);
+                            if (indiItem.uri) {
+                                if (indiItem.range) {
+                                    message.location = new Location(indiItem.uri, indiItem.range);
+                                }
                                 runInstance.failed(indiItem, message);
                             }
                         }
@@ -222,7 +226,7 @@ export class PythonResultResolver implements ITestResultResolver {
                     if (grabTestItem !== undefined) {
                         testCases.forEach((indiItem) => {
                             if (indiItem.id === grabVSid) {
-                                if (indiItem.uri && indiItem.range) {
+                                if (indiItem.uri) {
                                     runInstance.passed(grabTestItem);
                                 }
                             }
@@ -234,15 +238,15 @@ export class PythonResultResolver implements ITestResultResolver {
                     if (grabTestItem !== undefined) {
                         testCases.forEach((indiItem) => {
                             if (indiItem.id === grabVSid) {
-                                if (indiItem.uri && indiItem.range) {
+                                if (indiItem.uri) {
                                     runInstance.skipped(grabTestItem);
                                 }
                             }
                         });
                     }
                 } else if (testItem.outcome === 'subtest-failure') {
                     // split on [] or () based on how the subtest is setup.
-                    const [parentTestCaseId, subtestId] = splitTestNameWithRegex(keyTemp, this.testProvider);
+                    const [parentTestCaseId, subtestId] = splitTestNameWithRegex(keyTemp);
                     const parentTestItem = this.runIdToTestItem.get(parentTestCaseId);
                     const data = testItem;
                     // find the subtest's parent test item
@@ -258,7 +262,11 @@ export class PythonResultResolver implements ITestResultResolver {
                             // clear since subtest items don't persist between runs
                             clearAllChildren(parentTestItem);
                         }
-                        const subTestItem = this.testController?.createTestItem(subtestId, subtestId);
+                        const subTestItem = this.testController?.createTestItem(
+                            subtestId,
+                            subtestId,
+                            parentTestItem.uri,
+                        );
                         // create a new test item for the subtest
                         if (subTestItem) {
                             const traceback = data.traceback ?? '';
@@ -280,7 +288,7 @@ export class PythonResultResolver implements ITestResultResolver {
                     }
                 } else if (testItem.outcome === 'subtest-success') {
                     // split on [] or () based on how the subtest is setup.
-                    const [parentTestCaseId, subtestId] = splitTestNameWithRegex(keyTemp, this.testProvider);
+                    const [parentTestCaseId, subtestId] = splitTestNameWithRegex(keyTemp);
                     const parentTestItem = this.runIdToTestItem.get(parentTestCaseId);
 
                     // find the subtest's parent test item
@@ -293,7 +301,11 @@ export class PythonResultResolver implements ITestResultResolver {
                             // clear since subtest items don't persist between runs
                             clearAllChildren(parentTestItem);
                         }
-                        const subTestItem = this.testController?.createTestItem(subtestId, subtestId);
+                        const subTestItem = this.testController?.createTestItem(
+                            subtestId,
+                            subtestId,
+                            parentTestItem.uri,
+                        );
                         // create a new test item for the subtest
                         if (subTestItem) {
                             parentTestItem.children.add(subTestItem);