Run myunit test modules individually

Author: o11c

mypy/checkstrformat.py

@@ -10,7 +10,9 @@
 from mypy.nodes import (
     Node, StrExpr, TupleExpr, DictExpr, Context
 )
-import mypy.checker
+if False:
+    # break import cycle only needed for mypy
+    import mypy.checker
 from mypy import messages
 from mypy.messages import MessageBuilder
 

mypy/codec/test/test_function_translation.py

@@ -1,4 +1,5 @@
 import codecs
+import sys
 
 from unittest import TestCase
 
@@ -8,68 +9,68 @@
 # even indices are input functions, odd indices are expected output
 test_function_examples = [
 # test a function without annotations
-'''\
+b'''\
 def f(x):
     x = {'a': x}
     return x['a']
 ''',
-'''\
+b'''\
 def f(x):
     x = {'a': x}
     return x['a']
 ''',
 
 # test parameter type annotations
-'''\
+b'''\
 def f(x: int, y: str = 'abc'):
     return x
 ''',
-'''\
+b'''\
 def f(x     , y      = 'abc'):
     return x
 ''',
 
 # test return type annotations
-'''\
+b'''\
 def f(x, y) -> str:
     return x
 ''',
-'''\
+b'''\
 def f(x, y)       :
     return x
 ''',
 
 # test newlines in param list
-'''\
+b'''\
 def f(x: int,
                 y: str) -> str:
     return x
 ''',
-'''\
+b'''\
 def f(x     ,
                 y     )       :
     return x
 ''',
 
 # test newlines in return type annotation
-'''\
+b'''\
 def f(x: int, y: str='abc') -> Tuple[int,
                                 str]:
     return x, y
 ''',
-'''\
+b'''\
 def f(x     , y     ='abc')\\
                                     :
     return x, y
 ''',
 
 
 # test unrelated continuations
-'''\
+b'''\
 x = 1 + \
     2
 ''',
-'''\
+b'''\
 x = 1 + \
     2
 ''',
@@ -81,7 +82,11 @@ class TestFunctionTranslation(TestCase):
 
     def test_all_functions(self):
         for i in range(0, len(test_function_examples), 2):
-            func_translated = codecs.decode(test_function_examples[i], 'mypy')
-            #print repr(func_translated)
-            #print repr(test_function_examples[i + 1])
-            self.assertEqual(func_translated, test_function_examples[i + 1])
+            func_orig = test_function_examples[i]
+            func_py2 = test_function_examples[i + 1].decode('utf-8')
+            func_py3 = func_orig.decode('utf-8')
+            func_translated = codecs.decode(func_orig, 'mypy')
+            if sys.version_info[0] == 2:
+                self.assertEqual(func_translated, func_py2)
+            else:
+                self.assertEqual(func_translated, func_py3)

mypy/myunit.py renamed to mypy/myunit/__init__.py

@@ -1,3 +1,4 @@
+import importlib
 import os
 import sys
 import re
@@ -13,6 +14,8 @@
 is_quiet = False
 patterns = []  # type: List[str]
 times = []  # type: List[Tuple[float, str]]
+APPEND_TESTCASES = ''
+UPDATE_TESTCASES = False
 
 
 class AssertionFailure(Exception):
@@ -151,12 +154,38 @@ def skip(self) -> None:
         raise SkipTestCaseException()
 
 
-def run_test(t: Suite, args: List[str] = None) -> None:
+def add_suites_from_module(suites: List[Suite], mod_name: str) -> None:
+    mod = importlib.import_module(mod_name)
+    got_suite = False
+    for suite in mod.__dict__.values():
+        if isinstance(suite, type) and issubclass(suite, Suite) and suite is not Suite:
+            got_suite = True
+            suites.append(suite())
+    if not got_suite:
+        # Sanity check in case e.g. it uses unittest instead of a myunit.
+        # The codecs tests do since they need to be python2-compatible.
+        sys.exit('Test module %s had no test!' % mod_name)
+
+class ListSuite(Suite):
+    def __init__(self, suites: List[Suite]) -> None:
+        for suite in suites:
+            mod_name = type(suite).__module__.replace('.', '_')
+            mod_name = mod_name.replace('mypy_', '')
+            mod_name = mod_name.replace('test_', '')
+            mod_name = mod_name.strip('_').replace('__', '_')
+            type_name = type(suite).__name__
+            name = 'test_%s_%s' % (mod_name, type_name)
+            setattr(self, name, suite)
+        super().__init__()
+
+def main(args: List[str] = None) -> None:
     global patterns, is_verbose, is_quiet
+    global APPEND_TESTCASES, UPDATE_TESTCASES
     if not args:
-        args = []
+        args = sys.argv[1:]
     is_verbose = False
     is_quiet = False
+    suites = [] # type: List[Suite]
     patterns = []
     i = 0
     while i < len(args):
@@ -165,17 +194,28 @@ def run_test(t: Suite, args: List[str] = None) -> None:
             is_verbose = True
         elif a == '-q':
             is_quiet = True
-        # Used for updating tests, but breaks clean code usage.
-        elif a in ('-u', '-i'):
-            pass
-        elif len(a) > 0 and a[0] != '-':
+        elif a == '-u':
+            APPEND_TESTCASES = '.new'
+            UPDATE_TESTCASES = True
+        elif a == '-i':
+            APPEND_TESTCASES = ''
+            UPDATE_TESTCASES = True
+        elif a == '-m':
+            i += 1
+            if i == len(args):
+                sys.exit('-m requires an argument')
+            add_suites_from_module(suites, args[i])
+        elif not a.startswith('-'):
             patterns.append(a)
         else:
-            raise ValueError('Invalid arguments')
+            sys.exit('Usage: python -m mypy.myunit [-v] [-q] [-u | -i] -m test.module [-m test.module ...] [filter ...]')
         i += 1
     if len(patterns) == 0:
         patterns.append('*')
+    if not suites:
+        sys.exit('At least one -m argument is required')
 
+    t = ListSuite(suites)
     num_total, num_fail, num_skip = run_test_recursive(t, 0, 0, 0, '', 0)
 
     skip_msg = ''

mypy/myunit/__main__.py

@@ -0,0 +1,5 @@
+# This is a separate module from mypy.myunit so it doesn't exist twice.
+from mypy.myunit import main
+
+if __name__ == '__main__':
+    main()

mypy/nodes.py

@@ -20,7 +20,9 @@ class Context(metaclass=ABCMeta):
     def get_line(self) -> int: pass
 
 
-import mypy.types
+if False:
+    # break import cycle only needed for mypy
+    import mypy.types
 
 
 T = TypeVar('T')

mypy/subtypes.py

@@ -7,6 +7,8 @@
 )
 import mypy.applytype
 import mypy.constraints
+# Circular import; done in the function instead.
+#import mypy.solve
 from mypy import messages, sametypes
 from mypy.nodes import TypeInfo
 from mypy.expandtype import expand_type
@@ -232,6 +234,7 @@ def unify_generic_callable(type: CallableType, target: CallableType) -> Callable
 
     Return unified CallableType if successful; otherwise, return None.
     """
+    import mypy.solve
     constraints = []  # type: List[mypy.constraints.Constraint]
     for arg_type, target_arg_type in zip(type.arg_types, target.arg_types):
         c = mypy.constraints.infer_constraints(

mypy/test/testcheck.py

@@ -5,16 +5,15 @@
 import typing
 
 from mypy import build
-from mypy.myunit import Suite, run_test
+import mypy.myunit # for mutable globals (ick!)
+from mypy.myunit import Suite
 from mypy.test.config import test_temp_dir, test_data_prefix
 from mypy.test.data import parse_test_cases
 from mypy.test.helpers import assert_string_arrays_equal, testcase_pyversion, update_testcase_output
 from mypy.test.testsemanal import normalize_error_messages
 from mypy.errors import CompileError
 
 import sys
-APPEND_TESTCASES = '.new' if '-u' in sys.argv else ''
-UPDATE_TESTCASES = '-i' in sys.argv or '-u' in sys.argv
 
 # List of files that contain test case descriptions.
 files = [
@@ -73,15 +72,10 @@ def run_test(self, testcase):
         except CompileError as e:
             a = normalize_error_messages(e.messages)
 
-        if testcase.output != a and UPDATE_TESTCASES:
-            update_testcase_output(testcase, a, APPEND_TESTCASES)
+        if testcase.output != a and mypy.myunit.UPDATE_TESTCASES:
+            update_testcase_output(testcase, a, mypy.myunit.APPEND_TESTCASES)
 
         assert_string_arrays_equal(
             testcase.output, a,
             'Invalid type checker output ({}, line {})'.format(
                 testcase.file, testcase.line))
-
-
-if __name__ == '__main__':
-    import sys
-    run_test(TypeCheckSuite(), sys.argv[1:])

mypy/test/testinfer.py

@@ -2,7 +2,7 @@
 
 import typing
 
-from mypy.myunit import Suite, assert_equal, assert_true, run_test
+from mypy.myunit import Suite, assert_equal, assert_true
 from mypy.checkexpr import map_actuals_to_formals
 from mypy.nodes import ARG_POS, ARG_OPT, ARG_STAR, ARG_STAR2, ARG_NAMED
 from mypy.types import AnyType, TupleType
@@ -205,8 +205,3 @@ def expand_callee_kinds(kinds_and_names):
             kinds.append(v)
             names.append(None)
     return kinds, names
-
-
-if __name__ == '__main__':
-    import sys
-    run_test(MapActualsToFormalsSuite(), sys.argv[1:])

mypy/test/testopgen.py

@@ -6,7 +6,7 @@
 
 import typing
 
-from mypy.myunit import Suite, AssertionFailure, run_test
+from mypy.myunit import Suite, AssertionFailure
 from mypy.test.helpers import assert_string_arrays_equal
 from mypy.test.data import parse_test_cases
 from mypy.test import config
@@ -72,15 +72,3 @@ def test_parse_error(testcase):
             testcase.output, e.messages,
             'Invalid compiler output ({}, line {})'.format(testcase.file,
                                                            testcase.line))
-
-
-class CombinedParserSuite(Suite):
-    def __init__(self):
-        self.test_parse = ParserSuite()
-        self.test_parse_errors = ParseErrorSuite()
-        super().__init__()
-
-
-if __name__ == '__main__':
-    import sys
-    run_test(CombinedParserSuite(), sys.argv[1:])