split stubgen to data (pytest) and myunit; fix name-filtering regression

elazarg · elazarg · commit 4fbb8fdb6bb4 · 2017-08-26T20:53:10.000+03:00
diff --git a/mypy/test/teststubgen.py b/mypy/test/teststubgen.py
@@ -1,23 +1,8 @@
-import glob
-import importlib
-import os.path
-import random
-import shutil
-import sys
-import tempfile
-import time
-import re
 from types import ModuleType
 
 from typing import List, Tuple
 
-from mypy.myunit import Suite, AssertionFailure, assert_equal
-from mypy.test.helpers import assert_string_arrays_equal
-from mypy.test.data import parse_test_cases, DataDrivenTestCase
-from mypy.test import config
-from mypy.parse import parse
-from mypy.errors import CompileError
-from mypy.stubgen import generate_stub, generate_stub_for_module, parse_options, Options
+from mypy.myunit import Suite, assert_equal
 from mypy.stubgenc import generate_c_type_stub, infer_method_sig
 from mypy.stubutil import (
     parse_signature, parse_all_signatures, build_signature, find_unique_signatures,
@@ -95,89 +80,6 @@ def test_infer_sig_from_docstring(self) -> None:
         assert_equal(infer_sig_from_docstring('\nfunc x', 'func'), None)
 
 
-class StubgenPythonSuite(Suite):
-    test_data_files = ['stubgen.test']
-
-    def cases(self) -> List[DataDrivenTestCase]:
-        c = []  # type: List[DataDrivenTestCase]
-        for path in self.test_data_files:
-            c += parse_test_cases(os.path.join(config.test_data_prefix, path), test_stubgen)
-        return c
-
-
-def parse_flags(program_text: str) -> Options:
-    flags = re.search('# flags: (.*)$', program_text, flags=re.MULTILINE)
-    if flags:
-        flag_list = flags.group(1).split()
-    else:
-        flag_list = []
-    return parse_options(flag_list + ['dummy.py'])
-
-
-def test_stubgen(testcase: DataDrivenTestCase) -> None:
-    if 'stubgen-test-path' not in sys.path:
-        sys.path.insert(0, 'stubgen-test-path')
-    os.mkdir('stubgen-test-path')
-    source = '\n'.join(testcase.input)
-    options = parse_flags(source)
-    handle = tempfile.NamedTemporaryFile(prefix='prog_', suffix='.py', dir='stubgen-test-path',
-                                         delete=False)
-    assert os.path.isabs(handle.name)
-    path = os.path.basename(handle.name)
-    name = path[:-3]
-    path = os.path.join('stubgen-test-path', path)
-    out_dir = '_out'
-    os.mkdir(out_dir)
-    try:
-        handle.write(bytes(source, 'ascii'))
-        handle.close()
-        # Without this we may sometimes be unable to import the module below, as importlib
-        # caches os.listdir() results in Python 3.3+ (Guido explained this to me).
-        reset_importlib_caches()
-        try:
-            if testcase.name.endswith('_import'):
-                generate_stub_for_module(name, out_dir, quiet=True,
-                                         no_import=options.no_import,
-                                         include_private=options.include_private)
-            else:
-                generate_stub(path, out_dir, include_private=options.include_private)
-            a = load_output(out_dir)
-        except CompileError as e:
-            a = e.messages
-        assert_string_arrays_equal(testcase.output, a,
-                                   'Invalid output ({}, line {})'.format(
-                                       testcase.file, testcase.line))
-    finally:
-        handle.close()
-        os.unlink(handle.name)
-        shutil.rmtree(out_dir)
-
-
-def reset_importlib_caches() -> None:
-    try:
-        importlib.invalidate_caches()
-    except (ImportError, AttributeError):
-        pass
-
-
-def load_output(dirname: str) -> List[str]:
-    result = []  # type: List[str]
-    entries = glob.glob('%s/*' % dirname)
-    assert entries, 'No files generated'
-    if len(entries) == 1:
-        add_file(entries[0], result)
-    else:
-        for entry in entries:
-            result.append('## %s ##' % entry)
-            add_file(entry, result)
-    return result
-
-
-def add_file(path: str, result: List[str]) -> None:
-    with open(path) as file:
-        result.extend(file.read().splitlines())
-
-
 class StubgencSuite(Suite):
     def test_infer_hash_sig(self) -> None:
         assert_equal(infer_method_sig('__hash__'), '()')
diff --git a/mypy/test/teststubgendata.py b/mypy/test/teststubgendata.py
@@ -0,0 +1,108 @@
+import glob
+import importlib
+import os.path
+import shutil
+import sys
+import tempfile
+import re
+
+from typing import List
+
+from mypy.test.helpers import assert_string_arrays_equal
+from mypy.test.data import DataSuite, parse_test_cases, DataDrivenTestCase
+from mypy.test import config
+from mypy.errors import CompileError
+from mypy.stubgen import generate_stub, generate_stub_for_module, parse_options, Options
+
+
+# This file handles the data-driven part of the stubgen tests
+# The other part is in teststubgen.py
+# This splitting is necessary since data driven tests are executed by pytest,
+# whereas the rest of the tests are executed by myunit.
+
+
+class StubgenPythonSuite(DataSuite):
+    test_data_files = ['stubgen.test']
+
+    @classmethod
+    def cases(cls) -> List[DataDrivenTestCase]:
+        c = []  # type: List[DataDrivenTestCase]
+        for path in cls.test_data_files:
+            c += parse_test_cases(os.path.join(config.test_data_prefix, path), test_stubgen)
+        return c
+
+    def run_case(self, testcase: DataDrivenTestCase) -> None:
+        test_stubgen(testcase)
+
+
+def parse_flags(program_text: str) -> Options:
+    flags = re.search('# flags: (.*)$', program_text, flags=re.MULTILINE)
+    if flags:
+        flag_list = flags.group(1).split()
+    else:
+        flag_list = []
+    return parse_options(flag_list + ['dummy.py'])
+
+
+def test_stubgen(testcase: DataDrivenTestCase) -> None:
+    if 'stubgen-test-path' not in sys.path:
+        sys.path.insert(0, 'stubgen-test-path')
+    os.mkdir('stubgen-test-path')
+    source = '\n'.join(testcase.input)
+    options = parse_flags(source)
+    handle = tempfile.NamedTemporaryFile(prefix='prog_', suffix='.py', dir='stubgen-test-path',
+                                         delete=False)
+    assert os.path.isabs(handle.name)
+    path = os.path.basename(handle.name)
+    name = path[:-3]
+    path = os.path.join('stubgen-test-path', path)
+    out_dir = '_out'
+    os.mkdir(out_dir)
+    try:
+        handle.write(bytes(source, 'ascii'))
+        handle.close()
+        # Without this we may sometimes be unable to import the module below, as importlib
+        # caches os.listdir() results in Python 3.3+ (Guido explained this to me).
+        reset_importlib_caches()
+        try:
+            if testcase.name.endswith('_import'):
+                generate_stub_for_module(name, out_dir, quiet=True,
+                                         no_import=options.no_import,
+                                         include_private=options.include_private)
+            else:
+                generate_stub(path, out_dir, include_private=options.include_private)
+            a = load_output(out_dir)
+        except CompileError as e:
+            a = e.messages
+        assert_string_arrays_equal(testcase.output, a,
+                                   'Invalid output ({}, line {})'.format(
+                                       testcase.file, testcase.line))
+    finally:
+        handle.close()
+        os.unlink(handle.name)
+        shutil.rmtree(out_dir)
+
+
+def reset_importlib_caches() -> None:
+    try:
+        importlib.invalidate_caches()
+    except (ImportError, AttributeError):
+        pass
+
+
+def load_output(dirname: str) -> List[str]:
+    result = []  # type: List[str]
+    entries = glob.glob('%s/*' % dirname)
+    assert entries, 'No files generated'
+    if len(entries) == 1:
+        add_file(entries[0], result)
+    else:
+        for entry in entries:
+            result.append('## %s ##' % entry)
+            add_file(entry, result)
+    return result
+
+
+def add_file(path: str, result: List[str]) -> None:
+    with open(path) as file:
+        result.extend(file.read().splitlines())
diff --git a/runtests.py b/runtests.py
@@ -89,17 +89,17 @@ def add_mypy_package(self, name: str, packagename: str, *flags: str) -> None:
     def add_mypy_string(self, name: str, *args: str, cwd: Optional[str] = None) -> None:
         self.add_mypy_cmd(name, ['-c'] + list(args), cwd=cwd)
 
-    def add_pytest(self, name: str, pytest_files: List[str], coverage: bool = True) -> None:
-        pytest_args = pytest_files + self.arglist + self.pyt_arglist
-        full_name = 'pytest %s' % name
-        if not self.allow(full_name):
+    def add_pytest(self, pytest_files: List[str], coverage: bool = True) -> None:
+        pytest_files = [name for name in pytest_files if self.allow(name[4:])]
+        if not pytest_files:
             return
+        pytest_args = pytest_files + self.arglist + self.pyt_arglist
         if coverage and self.coverage:
             args = [sys.executable, '-m', 'pytest', '--cov=mypy'] + pytest_args
         else:
             args = [sys.executable, '-m', 'pytest'] + pytest_args
 
-        self.waiter.add(LazySubprocess(full_name, args, env=self.env, passthrough=self.verbosity),
+        self.waiter.add(LazySubprocess('pytest', args, env=self.env, passthrough=self.verbosity),
                         sequential=True)
 
     def add_python(self, name: str, *args: str, cwd: Optional[str] = None) -> None:
@@ -212,12 +212,12 @@ def test_path(*names: str):
     'testparse',
     'testsemanal',
     'testpythoneval',
-    'testcmdline'
+    'testcmdline',
+    'teststubgendata'
 )
 
 MYUNIT_FILES = test_path(
-    'teststubgen',  # contains data-driven suite
-
+    'teststubgen',
     'testargs',
     'testgraph',
     'testinfer',
@@ -233,7 +233,7 @@ def test_path(*names: str):
 
 
 def add_pytest(driver: Driver) -> None:
-    driver.add_pytest('pytest', PYTEST_FILES)
+    driver.add_pytest(PYTEST_FILES)
 
 
 def add_myunit(driver: Driver) -> None:
