Rename utils to pvsc_utils to prevent shadowing (#22760)

Closes #22575 Closes #22757
microsoft · Jan 17, 2024 · 6f0b841 · 6f0b841
1 parent baea7a1
commit 6f0b841
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/pythonFiles/tests/unittestadapter/expected_discovery_test_output.py b/pythonFiles/tests/unittestadapter/expected_discovery_test_output.py
@@ -2,7 +2,7 @@
 # Licensed under the MIT License.
 
 import os
-from unittestadapter.utils import TestNodeTypeEnum
+from unittestadapter.pvsc_utils import TestNodeTypeEnum
 from .helpers import TEST_DATA_PATH
 import pathlib
 

diff --git a/pythonFiles/tests/unittestadapter/test_discovery.py b/pythonFiles/tests/unittestadapter/test_discovery.py
@@ -7,7 +7,7 @@
 
 import pytest
 from unittestadapter.discovery import discover_tests
-from unittestadapter.utils import TestNodeTypeEnum, parse_unittest_args
+from unittestadapter.pvsc_utils import TestNodeTypeEnum, parse_unittest_args
 
 from . import expected_discovery_test_output
 from .helpers import TEST_DATA_PATH, is_same_tree

diff --git a/pythonFiles/tests/unittestadapter/test_utils.py b/pythonFiles/tests/unittestadapter/test_utils.py
@@ -7,7 +7,7 @@
 
 import pytest
 
-from unittestadapter.utils import (
+from unittestadapter.pvsc_utils import (
     TestNode,
     TestNodeTypeEnum,
     build_test_tree,

diff --git a/pythonFiles/unittestadapter/discovery.py b/pythonFiles/unittestadapter/discovery.py
@@ -17,7 +17,11 @@
 from typing_extensions import Literal, NotRequired, TypedDict
 
 # If I use from utils then there will be an import error in test_discovery.py.
-from unittestadapter.utils import TestNode, build_test_tree, parse_unittest_args
+from unittestadapter.pvsc_utils import (
+    TestNode,
+    build_test_tree,
+    parse_unittest_args,
+)
 
 DEFAULT_PORT = 45454
 

diff --git a/pythonFiles/unittestadapter/execution.py b/pythonFiles/unittestadapter/execution.py
@@ -19,7 +19,7 @@
 
 from testing_tools import process_json_util, socket_manager
 from typing_extensions import Literal, NotRequired, TypeAlias, TypedDict
-from unittestadapter.utils import parse_unittest_args
+from unittestadapter.pvsc_utils import parse_unittest_args
 
 ErrorType = Union[
     Tuple[Type[BaseException], BaseException, TracebackType], Tuple[None, None, None]

diff --git a/pythonFiles/unittestadapter/utils.py → pythonFiles/unittestadapter/pvsc_utils.py b/pythonFiles/unittestadapter/utils.py → pythonFiles/unittestadapter/pvsc_utils.py