GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — Fix tests for pytest 5 (#13775) · sroener/vscode-python@83c9777

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
  • build
    • test-requirements.txt
  • news/3 Code Health
    • 13726.md
  • pythonFiles
    • testing_tools/adapter
      • info.py
      • pytest
        • _pytest_item.py
      • util.py
    • tests/testing_tools/adapter
      • pytest
        • test_discovery.py
      • test_discovery.py
      • test_functional.py
      • test_report.py
      • test_util.py
  • src
    • client/testing/pytest/services
      • argsService.ts
    • test/testing
      • argsService.test.ts
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎build/test-requirements.txt‎

Copy file name to clipboardExpand all lines: build/test-requirements.txt
+5-3Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@ pycodestyle
1010
prospector==1.2.0 # Last version of prospector with Python 2.7 support
1111
pydocstyle
1212
nose
13-
pytest==4.6.9 # Last version of pytest with Python 2.7 support
14-
py==1.8.1
13+
pytest < 6.0.0; python_version > '2.7' # Tests do not support pytest 6 yet.
1514
rope
1615
flask
1716
django
1817
isort
19-
pathlib2>=2.2.0 ; python_version<'3.6' # Python 2.7 compatibility (pytest)
18+
# Python 2.7 compatibility (pytest)
19+
pytest==4.6.9; python_version == '2.7'
20+
pathlib2>=2.2.0; python_version == '2.7'
21+
py==1.8.1; python_version == '2.7'
Collapse file

‎news/3 Code Health/13726.md‎

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix a test failure and warning when running test adapter tests under pytest 5
Collapse file

‎pythonFiles/testing_tools/adapter/info.py‎

Copy file name to clipboardExpand all lines: pythonFiles/testing_tools/adapter/info.py
+6-4Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
from collections import namedtuple
55

66

7-
class TestPath(namedtuple("TestPath", "root relfile func sub")):
7+
class SingleTestPath(namedtuple("TestPath", "root relfile func sub")):
88
"""Where to find a single test."""
99

1010
def __new__(cls, root, relfile, func, sub=None):
11-
self = super(TestPath, cls).__new__(
11+
self = super(SingleTestPath, cls).__new__(
1212
cls,
1313
str(root) if root else None,
1414
str(relfile) if relfile else None,
@@ -62,14 +62,16 @@ def __init__(self, *args, **kwargs):
6262
raise TypeError("missing relpath")
6363

6464

65-
class TestInfo(namedtuple("TestInfo", "id name path source markers parentid kind")):
65+
class SingleTestInfo(
66+
namedtuple("TestInfo", "id name path source markers parentid kind")
67+
):
6668
"""Info for a single test."""
6769

6870
MARKERS = ("skip", "skip-if", "expected-failure")
6971
KINDS = ("function", "doctest")
7072

7173
def __new__(cls, id, name, path, source, markers, parentid, kind="function"):
72-
self = super(TestInfo, cls).__new__(
74+
self = super(SingleTestInfo, cls).__new__(
7375
cls,
7476
str(id) if id else None,
7577
str(name) if name else None,
Collapse file

‎pythonFiles/testing_tools/adapter/pytest/_pytest_item.py‎

Copy file name to clipboardExpand all lines: pythonFiles/testing_tools/adapter/pytest/_pytest_item.py
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
import _pytest.doctest
100100
import _pytest.unittest
101101

102-
from ..info import TestInfo, TestPath
102+
from ..info import SingleTestInfo, SingleTestPath
103103
from ..util import fix_fileid, PATH_SEP, NORMCASE
104104

105105

@@ -207,10 +207,10 @@ def parse_item(
207207
markers.add("expected-failure")
208208
# We can add support for other markers as we need them?
209209

210-
test = TestInfo(
210+
test = SingleTestInfo(
211211
id=nodeid,
212212
name=item.name,
213-
path=TestPath(
213+
path=SingleTestPath(
214214
root=testroot,
215215
relfile=relfile,
216216
func=testfunc,
Collapse file

‎pythonFiles/testing_tools/adapter/util.py‎

Copy file name to clipboardExpand all lines: pythonFiles/testing_tools/adapter/util.py
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# Licensed under the MIT License.
33

44
import contextlib
5+
import io
56

67
try:
78
from io import StringIO
@@ -180,7 +181,7 @@ def _replace_fd(file, target):
180181
"""
181182
try:
182183
fd = file.fileno()
183-
except AttributeError:
184+
except (AttributeError, io.UnsupportedOperation):
184185
# `file` does not have fileno() so it's been replaced from the
185186
# default sys.stdout, etc. Return with noop.
186187
yield

0 commit comments

Comments
0 (0)
You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.