Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename utils to pvsc_utils to prevent shadowing #22760

Merged
merged 1 commit into from
Jan 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion pythonFiles/tests/unittestadapter/test_discovery.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pythonFiles/tests/unittestadapter/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import pytest

from unittestadapter.utils import (
from unittestadapter.pvsc_utils import (
TestNode,
TestNodeTypeEnum,
build_test_tree,
Expand Down
6 changes: 5 additions & 1 deletion pythonFiles/unittestadapter/discovery.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion pythonFiles/unittestadapter/execution.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
Loading