tweaks for polish

mypy/test/data.py

@@ -22,6 +22,10 @@ def parse_test_cases(
     """Parse a file with test case descriptions.
 
     Return an array of test cases.
+
+    NB this function and DataDrivenTestCase are shared between the
+    myunit and pytest codepaths -- if something looks redundant,
+    that's likely the reason.
     """
 
     if not include_path:
@@ -356,8 +360,6 @@ def pytest_addoption(parser):
 def pytest_pycollect_makeitem(collector, name, obj):
     if not isinstance(obj, type) or not issubclass(obj, DataSuite):
         return None
-    #os.write(3, ('collecting: %r %r %r\n' % (collector, name, obj)).encode('utf-8'))
-
     return MypyDataSuite(name, parent=collector)
 
 

pytest.ini

@@ -1,5 +1,11 @@
 [pytest]
+# testpaths is new in 2.8
 minversion = 2.8
+
 testpaths = mypy/test
+
 python_files = test*.py
-python_functions = 
+
+# empty patterns for default python collector, to stick to our plugin's collector
+python_classes =
+python_functions =

test-requirements.txt

@@ -1,3 +1,3 @@
 flake8
 typed-ast
-pytest>=2.9
+pytest>=2.8