Fix tests for pytest 5 (microsoft#13775)

Author: brettcannon

build/test-requirements.txt

@@ -10,10 +10,12 @@ pycodestyle
 prospector==1.2.0 # Last version of prospector with Python 2.7 support
 pydocstyle
 nose
-pytest==4.6.9 # Last version of pytest with Python 2.7 support
-py==1.8.1
+pytest < 6.0.0; python_version > '2.7' # Tests do not support pytest 6 yet.
 rope
 flask
 django
 isort
-pathlib2>=2.2.0 ; python_version<'3.6' # Python 2.7 compatibility (pytest)
+ # Python 2.7 compatibility (pytest)
+pytest==4.6.9; python_version == '2.7'
+pathlib2>=2.2.0; python_version == '2.7'
+py==1.8.1; python_version == '2.7'

news/3 Code Health/13726.md

@@ -0,0 +1 @@
+Fix a test failure and warning when running test adapter tests under pytest 5

pythonFiles/testing_tools/adapter/info.py

@@ -4,11 +4,11 @@
 from collections import namedtuple
 
 
-class TestPath(namedtuple("TestPath", "root relfile func sub")):
+class SingleTestPath(namedtuple("TestPath", "root relfile func sub")):
  """Where to find a single test."""
 
  def __new__(cls, root, relfile, func, sub=None):
- self = super(TestPath, cls).__new__(
+ self = super(SingleTestPath, cls).__new__(
  cls,
  str(root) if root else None,
  str(relfile) if relfile else None,
@@ -62,14 +62,16 @@ def __init__(self, *args, **kwargs):
  raise TypeError("missing relpath")
 
 
-class TestInfo(namedtuple("TestInfo", "id name path source markers parentid kind")):
+class SingleTestInfo(
+ namedtuple("TestInfo", "id name path source markers parentid kind")
+):
  """Info for a single test."""
 
  MARKERS = ("skip", "skip-if", "expected-failure")
  KINDS = ("function", "doctest")
 
  def __new__(cls, id, name, path, source, markers, parentid, kind="function"):
- self = super(TestInfo, cls).__new__(
+ self = super(SingleTestInfo, cls).__new__(
  cls,
  str(id) if id else None,
  str(name) if name else None,

pythonFiles/testing_tools/adapter/pytest/_pytest_item.py

@@ -99,7 +99,7 @@
 import _pytest.doctest
 import _pytest.unittest
 
-from ..info import TestInfo, TestPath
+from ..info import SingleTestInfo, SingleTestPath
 from ..util import fix_fileid, PATH_SEP, NORMCASE
 
 
@@ -207,10 +207,10 @@ def parse_item(
  markers.add("expected-failure")
  # We can add support for other markers as we need them?
 
- test = TestInfo(
+ test = SingleTestInfo(
  id=nodeid,
  name=item.name,
- path=TestPath(
+ path=SingleTestPath(
  root=testroot,
  relfile=relfile,
  func=testfunc,

pythonFiles/testing_tools/adapter/util.py

@@ -2,6 +2,7 @@
 # Licensed under the MIT License.
 
 import contextlib
+import io
 
 try:
  from io import StringIO
@@ -180,7 +181,7 @@ def _replace_fd(file, target):
  """
  try:
  fd = file.fileno()
- except AttributeError:
+ except (AttributeError, io.UnsupportedOperation):
  # `file` does not have fileno() so it's been replaced from the
  # default sys.stdout, etc. Return with noop.
  yield