Move test data out of mypy/ (#1667)

This makes it easier to grep through our codebase to find things
quickly without getting noise from matches in our tests --
after all, our test data naturally has a lot of Python code,
just like mypy itself.  #compilerworldproblems

Specifically, move what was mypy/test/data/ inside a new directory
test-data/.  While we're at it, tuck samples/ and stdlib-samples/
under test-data/ too.  This is probably still not the perfect layout
(e.g., does stdlib-samples/ need to be special, or can it just be more
samples organized into a directory under samples/?), but with all the
file moves in this commit I wanted to keep the necessary logic changes
to an absolute minimum for ease of reading and reviewing.

The `-M` flag to `git show/diff/log` is highly recommended when
looking at this commit.

Author: gnprice

mypy/build.py

@@ -169,8 +169,10 @@ def build(sources: List[BuildSource],
 
     if TEST_BUILTINS in flags:
         # Use stub builtins (to speed up test cases and to make them easier to
-        # debug).
-        lib_path.insert(0, os.path.join(os.path.dirname(__file__), 'test', 'data', 'lib-stub'))
+        # debug).  This is a test-only feature, so assume our files are laid out
+        # as in the source tree.
+        root_dir = os.path.dirname(os.path.dirname(__file__))
+        lib_path.insert(0, os.path.join(root_dir, 'test-data', 'unit', 'lib-stub'))
     else:
         for source in sources:
             if source.path:

mypy/test/config.py

@@ -4,10 +4,11 @@
 import typing
 
 
-PREFIX = ''
+this_file_dir = os.path.dirname(os.path.realpath(__file__))
+PREFIX = os.path.dirname(os.path.dirname(this_file_dir))
 
 # Location of test data files such as test case descriptions.
-test_data_prefix = os.path.join(PREFIX, 'mypy', 'test', 'data')
+test_data_prefix = os.path.join(PREFIX, 'test-data', 'unit')
 
 assert os.path.isdir(test_data_prefix), \
     'Test data prefix ({}) not set correctly'.format(test_data_prefix)

mypy/test/helpers.py

@@ -6,7 +6,6 @@
 
 from mypy import defaults
 from mypy.myunit import AssertionFailure
-from mypy.test import config
 from mypy.test.data import DataDrivenTestCase
 
 
@@ -191,7 +190,7 @@ def clean_up(a: List[str]) -> List[str]:
     """
     res = []
     for s in a:
-        prefix = config.PREFIX + os.sep
+        prefix = os.sep
         ss = s
         for p in prefix, prefix.replace(os.sep, '/'):
             if p != '/' and p != '//' and p != '\\' and p != '\\\\':

mypy/test/testparse.py

@@ -1,6 +1,4 @@
-"""Tests for the mypy parser
-
-Test case descriptions are in files test/data/parse[-errors].test."""
+"""Tests for the mypy parser."""
 
 import os.path
 

runtests.py

@@ -155,7 +155,7 @@ def add_basic(driver: Driver) -> None:
     driver.add_mypy('legacy myunit script', 'scripts/myunit')
     driver.add_flake8('legacy myunit script', 'scripts/myunit')
     # needs typed_ast installed:
-    driver.add_mypy('fast-parse', '--fast-parse', 'samples/hello.py')
+    driver.add_mypy('fast-parse', '--fast-parse', 'test-data/samples/hello.py')
 
 
 def add_selftypecheck(driver: Driver) -> None:
@@ -182,8 +182,6 @@ def add_imports(driver: Driver) -> None:
     # because of *implicit* imports from other modules.
     for f in find_files('mypy', suffix='.py'):
         mod = file_to_module(f)
-        if '.test.data.' in mod:
-            continue
         if not mod.endswith('.__main__'):
             driver.add_python_string('import %s' % mod, 'import %s' % mod)
         driver.add_flake8('module %s' % mod, f)
@@ -235,7 +233,7 @@ def add_stubs(driver: Driver) -> None:
 def add_stdlibsamples(driver: Driver) -> None:
     seen = set()  # type: Set[str]
     for version in driver.versions:
-        stdlibsamples_dir = join(driver.cwd, 'stdlib-samples', version)
+        stdlibsamples_dir = join(driver.cwd, 'test-data', 'stdlib-samples', version)
         modules = []  # type: List[str]
         for f in find_files(stdlibsamples_dir, prefix='test_', suffix='.py'):
             module = file_to_module(f[len(stdlibsamples_dir) + 1:])
@@ -248,7 +246,7 @@ def add_stdlibsamples(driver: Driver) -> None:
 
 
 def add_samples(driver: Driver) -> None:
-    for f in find_files('samples', suffix='.py'):
+    for f in find_files(os.path.join('test-data', 'samples'), suffix='.py'):
         if 'codec' in f:
             cwd, bf = os.path.dirname(f), os.path.basename(f)
             bf = bf[:-len('.py')]

setup.cfg

@@ -1,6 +1,6 @@
 [flake8]
 max-line-length = 99
-exclude = mypy/codec/*,mypy/test/data/lib-stub/*,mypy/test/data/fixtures/*
+exclude = mypy/codec/*
 # Thing to ignore:
 #   E251: spaces around default arg value (against our style)
 #   E128: continuation line under-indented (too noisy)