Skip to content
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
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "python",
"displayName": "Python",
"description": "IntelliSense (Pylance), Linting, Debugging (multi-threaded, remote), Jupyter Notebooks, code formatting, refactoring, unit tests, and more.",
"version": "2023.2.0-rc",
"version": "2023.2.0",
"featureFlags": {
"usingNewInterpreterStorage": true
},
Expand Down
1 change: 0 additions & 1 deletion pythonFiles/testing_tools/adapter/info.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ def __init__(self, *args, **kwargs):


class ParentInfo(namedtuple("ParentInfo", "id kind name root relpath parentid")):

KINDS = ("folder", "file", "suite", "function", "subtest")

def __new__(cls, id, kind, name, root=None, relpath=None, parentid=None):
Expand Down
2 changes: 1 addition & 1 deletion pythonFiles/testing_tools/adapter/pytest/_discovery.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def discover(
pytestargs = _adjust_pytest_args(pytestargs)
# We use this helper rather than "-pno:terminal" due to possible
# platform-dependent issues.
with (util.hide_stdio() if hidestdio else util.noop_cm()) as stdio:
with util.hide_stdio() if hidestdio else util.noop_cm() as stdio:
ec = _pytest_main(pytestargs, [_plugin])
# See: https://docs.pytest.org/en/latest/usage.html#possible-exit-codes
if ec == 5:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ def main(self, args, plugins):


class StubPlugin(util.StubProxy):

_started = True

def __init__(self, stub=None, tests=None):
Expand All @@ -66,7 +65,6 @@ def func(*args, **kwargs):


class StubDiscoveredTests(util.StubProxy):

NOT_FOUND = object()

def __init__(self, stub=None):
Expand Down Expand Up @@ -105,7 +103,6 @@ def __init__(self, name):


class StubPytestItem(util.StubProxy):

_debugging = False
_hasfunc = True

Expand Down Expand Up @@ -218,6 +215,7 @@ def normcase(path):

else:
raise NotImplementedError

##########
def _fix_fileid(*args):
return adapter_util.fix_fileid(
Expand Down Expand Up @@ -332,7 +330,6 @@ def ret(args, plugins):


class DiscoverTests(unittest.TestCase):

DEFAULT_ARGS = [
"--collect-only",
]
Expand Down
1 change: 0 additions & 1 deletion pythonFiles/tests/testing_tools/adapter/test___main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ def test_unsupported_tool(self):


class MainTests(unittest.TestCase):

# TODO: We could use an integration test for pytest.discover().

def test_discover(self):
Expand Down
1 change: 0 additions & 1 deletion pythonFiles/tests/testing_tools/adapter/test_discovery.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@


def _fix_nodeid(nodeid):

nodeid = nodeid.replace("\\", "/")
if not nodeid.startswith("./"):
nodeid = "./" + nodeid
Expand Down
1 change: 0 additions & 1 deletion pythonFiles/unittestadapter/execution.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ class TestOutcomeEnum(str, enum.Enum):


class UnittestTestResult(unittest.TextTestResult):

formatted: Dict[str, Dict[str, str | None]] = dict()

def startTest(self, test: unittest.TestCase):
Expand Down