Fixing Windows tests [wip]

Author: jtatum

mypy/test/data.py

@@ -65,6 +65,8 @@ def parse_test_cases(
             tcout = []  # type: List[str]
             if i < len(p) and p[i].id == 'out':
                 tcout = p[i].data
+                if p[i].arg == 'pathfix':
+                    tcout = [s.replace('/', os.path.sep) for s in tcout]
                 ok = True
                 i += 1
             elif optional_out:

mypy/test/data/cmdline.test

@@ -18,7 +18,7 @@ undef
 [file pkg/subpkg/a.py]
 undef
 import pkg.subpkg.a
-[out]
+[out pathfix]
 pkg/a.py:1: error: Name 'undef' is not defined
 pkg/subpkg/a.py:1: error: Name 'undef' is not defined
 
@@ -31,7 +31,7 @@ undef
 [file pkg/subpkg/a.py]
 undef
 import pkg.subpkg.a
-[out]
+[out pathfix]
 pkg/a.py:1: error: Name 'undef' is not defined
 pkg/subpkg/a.py:1: error: Name 'undef' is not defined
 
@@ -41,7 +41,7 @@ pkg/subpkg/a.py:1: error: Name 'undef' is not defined
 undef
 [file dir/subdir/a.py]
 undef
-[out]
+[out pathfix]
 dir/a.py:1: error: Name 'undef' is not defined
 
 [case testCmdlineNonPackageSlash]
@@ -50,7 +50,7 @@ dir/a.py:1: error: Name 'undef' is not defined
 undef
 [file dir/subdir/a.py]
 undef
-[out]
+[out pathfix]
 dir/a.py:1: error: Name 'undef' is not defined
 
 [case testCmdlinePackageContainingSubdir]
@@ -60,7 +60,7 @@ dir/a.py:1: error: Name 'undef' is not defined
 undef
 [file pkg/subdir/a.py]
 undef
-[out]
+[out pathfix]
 pkg/a.py:1: error: Name 'undef' is not defined
 
 [case testCmdlineNonPackageContainingPackage]
@@ -71,6 +71,6 @@ import subpkg.a
 [file dir/subpkg/__init__.py]
 [file dir/subpkg/a.py]
 undef
-[out]
+[out pathfix]
 dir/subpkg/a.py:1: error: Name 'undef' is not defined
 dir/a.py:1: error: Name 'undef' is not defined

mypy/test/data/semanal-modules.test

@@ -770,7 +770,7 @@ import m.x
 [file m/__init__.py]
 [file m/x.py]
 from .x import nonexistent
-[out]
+[out pathfix]
 main:1: note: In module imported here:
 tmp/m/x.py:1: error: Module has no attribute 'nonexistent'
 
@@ -779,7 +779,7 @@ import m.x
 [file m/__init__.py]
 [file m/x.py]
 from m.x import nonexistent
-[out]
+[out pathfix]
 main:1: note: In module imported here:
 tmp/m/x.py:1: error: Module has no attribute 'nonexistent'
 
@@ -846,7 +846,7 @@ import m
 x
 [file m.py]
 y
-[out]
+[out pathfix]
 main:1: note: In module imported here:
 tmp/m.py:1: error: Name 'y' is not defined
 main:2: error: Name 'x' is not defined

mypy/test/testcheck.py

@@ -152,7 +152,8 @@ def find_error_paths(self, a: List[str]) -> Set[str]:
         for line in a:
             m = re.match(r'([^\s:]+):\d+: error:', line)
             if m:
-                hits.add(m.group(1))
+                p = m.group(1).replace('/', os.path.sep)
+                hits.add(p)
         return hits
 
     def find_module_files(self) -> Dict[str, str]:

mypy/test/teststubgen.py

@@ -108,34 +108,35 @@ def test_stubgen(testcase):
         sys.path.insert(0, 'stubgen-test-path')
     os.mkdir('stubgen-test-path')
     source = '\n'.join(testcase.input)
-    handle = tempfile.NamedTemporaryFile(prefix='prog_', suffix='.py', dir='stubgen-test-path')
+    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:
-        with open(path, 'w') as file:
-            file.write(source)
-            file.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)
-                else:
-                    generate_stub(path, out_dir)
-                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))
+        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)
+            else:
+                generate_stub(path, out_dir)
+            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:
-        shutil.rmtree(out_dir)
         handle.close()
+        os.unlink(handle.name)
+        shutil.rmtree(out_dir)
 
 
 def reset_importlib_caches():