Allow testsuite to run in parallel

Author: o11c

.travis.yml

@@ -7,4 +7,4 @@ python:
 
 install: python setup.py install
 
-script: bash travis.sh
+script: python travis.py

mypy/build.py

@@ -133,7 +133,7 @@ def build(program_path: str,
     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('mypy', 'test', 'data', 'lib-stub'))
+        lib_path.insert(0, os.path.join(os.path.dirname(__file__), 'test', 'data', 'lib-stub'))
     elif program_path:
         # Include directory of the program file in the module search path.
         lib_path.insert(
@@ -179,8 +179,8 @@ def build(program_path: str,
 def default_data_dir(bin_dir: str) -> str:
     # TODO fix this logic
     if not bin_dir:
-        # Default to current directory.
-        return ''
+        # Default to directory containing this file's parent.
+        return os.path.dirname(os.path.dirname(__file__))
     base = os.path.basename(bin_dir)
     dir = os.path.dirname(bin_dir)
     if (sys.platform == 'win32' and base.lower() == 'mypy'

mypy/myunit.py

@@ -1,5 +1,7 @@
+import os
 import sys
 import re
+import tempfile
 import time
 import traceback
 
@@ -91,18 +93,28 @@ def __init__(self, name: str, suite: 'Suite' = None,
         self.func = func
         self.name = name
         self.suite = suite
+        self.old_cwd = None # type: str
+        self.tmpdir = None # type: tempfile.TemporaryDirectory
 
     def run(self) -> None:
         if self.func:
             self.func()
 
     def set_up(self) -> None:
+        self.old_cwd = os.getcwd()
+        self.tmpdir = tempfile.TemporaryDirectory(prefix='mypy-test-', dir=os.path.abspath('tmp-test-dirs'))
+        os.chdir(self.tmpdir.name)
+        os.mkdir('tmp')
         if self.suite:
             self.suite.set_up()
 
     def tear_down(self) -> None:
         if self.suite:
             self.suite.tear_down()
+        os.chdir(self.old_cwd)
+        self.tmpdir.cleanup()
+        self.old_cwd = None
+        self.tmpdir = None
 
 
 class Suite:

mypy/test/config.py

@@ -13,10 +13,6 @@
     'Test data prefix ({}) not set correctly'.format(test_data_prefix)
 
 # Temp directory used for the temp files created when running test cases.
-test_temp_dir = os.path.join(PREFIX, 'tmp')
-
-if not os.path.isdir(test_temp_dir):
-    os.mkdir(test_temp_dir)
-
-assert os.path.isdir(test_temp_dir), \
-    'Test temp dir ({}) not set correctly'.format(test_temp_dir)
+# This is *within* the tempfile.TemporaryDirectory that is chroot'ed per testcase.
+# It is also hard-coded in numerous places, so don't change it.
+test_temp_dir = 'tmp'

mypy/test/testpythoneval.py

@@ -32,7 +32,7 @@
 # Path to Python 3 interpreter
 python3_path = sys.executable
 
-default_python2_interpreter = 'python'
+default_python2_interpreter = 'python2'
 
 
 class PythonEvaluationSuite(Suite):
@@ -68,25 +68,24 @@ def test_python_evaluation(testcase):
     with open(program_path, 'w') as file:
         for s in testcase.input:
             file.write('{}\n'.format(s))
-    # Set up module path.
-    typing_path = os.path.join(os.getcwd(), 'lib-typing', '3.2')
-    assert os.path.isdir(typing_path)
-    env = os.environ.copy()
-    env['PYTHONPATH'] = os.pathsep.join([typing_path, os.getcwd()])
     # Type check the program.
+    # This uses the same PYTHONPATH as the current process.
     process = subprocess.Popen([python3_path,
-                                os.path.join(os.getcwd(), 'scripts', 'mypy')] + args + [program],
+                                os.path.join(testcase.old_cwd, 'scripts', 'mypy')] + args + [program],
                                stdout=subprocess.PIPE,
                                stderr=subprocess.STDOUT,
-                               cwd=test_temp_dir,
-                               env=env)
+                               cwd=test_temp_dir)
     outb = process.stdout.read()
     # Split output into lines.
     out = [s.rstrip('\n\r') for s in str(outb, 'utf8').splitlines()]
     if not process.wait():
-        if py2:
-            typing_path = os.path.join(os.getcwd(), 'lib-typing', '2.7')
-            env['PYTHONPATH'] = typing_path
+        # Set up module path for the execution.
+        # This needs the typing module but *not* the mypy module.
+        vers_dir = '2.7' if py2 else '3.2'
+        typing_path = os.path.join(testcase.old_cwd, 'lib-typing', vers_dir)
+        assert os.path.isdir(typing_path)
+        env = os.environ.copy()
+        env['PYTHONPATH'] = typing_path
         process = subprocess.Popen([interpreter, program],
                                    stdout=subprocess.PIPE,
                                    stderr=subprocess.STDOUT,

mypy/test/teststubgen.py

@@ -3,6 +3,8 @@
 import os.path
 import random
 import shutil
+import sys
+import tempfile
 import time
 
 import typing
@@ -102,9 +104,15 @@ def cases(self):
 
 
 def test_stubgen(testcase):
+    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)
-    name = 'prog%d' % random.randrange(1000 * 1000 * 1000)
-    path = '%s.py' % name
+    handle = tempfile.NamedTemporaryFile(prefix='prog_', suffix='.py', dir='stubgen-test-path')
+    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:
@@ -127,7 +135,7 @@ def test_stubgen(testcase):
                                            testcase.file, testcase.line))
     finally:
         shutil.rmtree(out_dir)
-        os.remove(path)
+        handle.close()
 
 
 def reset_importlib_caches():

mypy/waiter.py

@@ -44,7 +44,6 @@ def __init__(self, limit=0) -> None:
                 # Note: only count CPUs we are allowed to use. It is a
                 # major mistake to count *all* CPUs on the machine.
                 limit = len(sched_getaffinity(0))
-        limit = 1
         self.limit = limit
         assert limit > 0
         print('%-8s %d' % ('PARALLEL', limit))

tmp-test-dirs/.gitignore

@@ -0,0 +1,4 @@
+# This directory is used to store temporary directories for the testsuite.
+# If anything manages to exist here, it means python crashed instead of
+# calling tempfile.TemporaryDirectory's cleanup while unwinding.
+# Therefore, don't actually provide any ignore patterns.