Tweak up the last merge

2 files changed, 15 insertions, 8 deletions

diff --git a/coverage/files.py b/coverage/files.py
index 1feb9b6..a800b7a 100644
--- a/coverage/files.py
+++ b/coverage/files.py
@@ -64,6 +64,7 @@ if env.WINDOWS:
 
         head, tail = os.path.split(path)
         if not tail:
+            # This means head is the drive spec: normalize it.
             actpath = head.upper()
         elif not head:
             actpath = tail
diff --git a/tests/test_files.py b/tests/test_files.py
index 85c7048..cd571e0 100644
--- a/tests/test_files.py
+++ b/tests/test_files.py
@@ -13,14 +13,6 @@ from coverage import env
 from tests.coveragetest import CoverageTest
 
 
-if env.WINDOWS:
-    class IncompleteWindowsTest(CoverageTest):
-        run_in_temp_dir = False
-
-        def test_actual_path(self):
-            self.assertEquals(actual_path(r'c:\Windows'), actual_path(r'C:\wINDOWS'))
-
-
 class FileLocatorTest(CoverageTest):
     """Tests of `FileLocator`."""
 
@@ -257,3 +249,17 @@ class FindPythonFilesTest(CoverageTest):
             "sub/ssub/__init__.py", "sub/ssub/s.py",
             "sub/windows.pyw",
             ])
+
+
+class WindowsFileTest(CoverageTest):
+    """Windows-specific tests of file name handling."""
+
+    run_in_temp_dir = False
+
+    def setUp(self):
+        if not env.WINDOWS:
+            self.skip("Only need to run Windows tests on Windows.")
+        super(WindowsFileTest, self).setUp()
+
+    def test_actual_path(self):
+        self.assertEquals(actual_path(r'c:\Windows'), actual_path(r'C:\wINDOWS'))