cleanup

Author: elazarg

runtests.py

@@ -211,11 +211,10 @@ def test_path(*names: str):
     'testtypegen',
     'testparse',
     'testsemanal',
+    'testpythoneval',
+    'testcmdline'
 )
 
-PYEVAL_FILES = test_path('testpythoneval')
-CMD_FILES = test_path('testcmdline')
-
 MYUNIT_FILES = test_path(
     'teststubgen',  # contains data-driven suite
 
@@ -229,36 +228,19 @@ def test_path(*names: str):
     'testtypes'
 )
 
+for f in find_files('mypy', prefix='test', suffix='.py'):
+    assert f in PYTEST_FILES + MYUNIT_FILES, f
 
-def add_pytest(driver: Driver) -> None:
-    driver.add_pytest('pytest', PYEVAL_FILES + CMD_FILES + PYTEST_FILES)
-
-
-def add_pythoneval(driver: Driver) -> None:
-    pass
-    # driver.add_pytest('eval', PYEVAL_FILES)
 
-
-def add_cmdline(driver: Driver) -> None:
-    pass
-    # driver.add_pytest('cmd', CMD_FILES)
+def add_pytest(driver: Driver) -> None:
+    driver.add_pytest('pytest', PYTEST_FILES)
 
 
 def add_myunit(driver: Driver) -> None:
-    for f in find_files('mypy', prefix='test', suffix='.py'):
+    for f in MYUNIT_FILES:
         mod = file_to_module(f)
-        if mod in ('mypy.test.testpythoneval', 'mypy.test.testcmdline'):
-            # Run Python evaluation integration tests and command-line
-            # parsing tests separately since they are much slower than
-            # proper unit tests.
-            pass
-        elif f in PYTEST_FILES:
-            # This module has been converted to pytest; don't try to use myunit.
-            pass
-        else:
-            assert f in MYUNIT_FILES, f
-            driver.add_python_mod('unit-test %s' % mod, 'mypy.myunit', '-m', mod,
-                                  *driver.arglist, coverage=True)
+        driver.add_python_mod('unit-test %s' % mod, 'mypy.myunit', '-m', mod,
+                              *driver.arglist, coverage=True)
 
 
 def add_stubs(driver: Driver) -> None:
@@ -432,8 +414,6 @@ def main() -> None:
 
     driver.add_flake8()
     add_pytest(driver)
-    add_pythoneval(driver)
-    add_cmdline(driver)
     add_basic(driver)
     add_selftypecheck(driver)
     add_myunit(driver)