Merge pull request #967 from JPeterMugaas/wintests

Windows path issues

Author: asottile

testsuite/test_shell.py

@@ -79,7 +79,7 @@ def test_check_simple(self):
         self.assertFalse(stderr)
         self.assertEqual(len(stdout), 24)
         for line, num, col in zip(stdout, (3, 6, 6, 9, 12), (3, 6, 6, 1, 5)):
-            path, x, y, msg = line.split(':')
+            path, x, y, msg = line.rsplit(':', 3)
             self.assertTrue(path.endswith(E11))
             self.assertEqual(x, str(num))
             self.assertEqual(y, str(col))

testsuite/test_util.py

@@ -18,6 +18,6 @@ def test_normalize_paths(self):
         self.assertEqual(normalize_paths('foo,bar'), ['foo', 'bar'])
         self.assertEqual(normalize_paths('foo,  bar  '), ['foo', 'bar'])
         self.assertEqual(normalize_paths('/foo/bar,baz/../bat'),
-                         ['/foo/bar', cwd + '/bat'])
+                         [os.path.realpath('/foo/bar'), cwd + '/bat'])
         self.assertEqual(normalize_paths(".pyc,\n   build/*"),
                          ['.pyc', cwd + '/build/*'])