Make shell tests work on windows

Author: jnmclarty

testsuite/test_shell.py

@@ -7,6 +7,19 @@
 from testsuite.support import ROOT_DIR, PseudoFile
 
 
+def safe_line_split(line):
+    split = line.split(':')
+    if 'win' in sys.platform:
+        try:
+            drive, path, x, y, msg = split
+            path = drive + ':' + path
+        except:
+            path, x, y, msg = split
+    else:
+        path, x, y, msg = split
+    return path, x, y, msg
+
+
 class ShellTestCase(unittest.TestCase):
     """Test the usual CLI options and output."""
 
@@ -77,7 +90,7 @@ def test_check_simple(self):
         self.assertFalse(stderr)
         self.assertEqual(len(stdout), 17)
         for line, num, col in zip(stdout, (3, 6, 9, 12), (3, 6, 1, 5)):
-            path, x, y, msg = line.split(':')
+            path, x, y, msg = safe_line_split(line)
             self.assertTrue(path.endswith(E11))
             self.assertEqual(x, str(num))
             self.assertEqual(y, str(col))
@@ -141,7 +154,7 @@ def test_check_diff(self):
         self.assertEqual(errcode, 1)
         self.assertFalse(stderr)
         for line, num, col in zip(stdout, (3, 6), (3, 6)):
-            path, x, y, msg = line.split(':')
+            path, x, y, msg = safe_line_split(line)
             self.assertEqual(x, str(num))
             self.assertEqual(y, str(col))
             self.assertTrue(msg.startswith(' E11'))
@@ -154,7 +167,7 @@ def test_check_diff(self):
         self.assertEqual(errcode, 1)
         self.assertFalse(stderr)
         for line, num, col in zip(stdout, (3, 6), (3, 6)):
-            path, x, y, msg = line.split(':')
+            path, x, y, msg = safe_line_split(line)
             self.assertEqual(x, str(num))
             self.assertEqual(y, str(col))
             self.assertTrue(msg.startswith(' E11'))