diff options
| -rw-r--r-- | coverage/files.py | 6 | ||||
| -rw-r--r-- | tests/test_files.py | 14 |
2 files changed, 18 insertions, 2 deletions
diff --git a/coverage/files.py b/coverage/files.py index 5c2ff1ac..59b2bd61 100644 --- a/coverage/files.py +++ b/coverage/files.py @@ -359,17 +359,19 @@ class PathAliases(object): match an entire tree, and not just its root. """ + pattern_sep = sep(pattern) + if len(pattern) > 1: pattern = pattern.rstrip(r"\/") # The pattern can't end with a wildcard component. if pattern.endswith("*"): raise CoverageException("Pattern must not end with wildcards.") - pattern_sep = sep(pattern) # The pattern is meant to match a filepath. Let's make it absolute # unless it already is, or is meant to match any prefix. - if not pattern.startswith('*') and not isabs_anywhere(pattern): + if not pattern.startswith('*') and not isabs_anywhere(pattern + + pattern_sep): pattern = abs_file(pattern) if not pattern.endswith(pattern_sep): pattern += pattern_sep diff --git a/tests/test_files.py b/tests/test_files.py index 9df4e5d0..84e25f10 100644 --- a/tests/test_files.py +++ b/tests/test_files.py @@ -349,6 +349,20 @@ class PathAliasesTest(CoverageTest): './django/foo/bar.py' ) + def test_windows_root_paths(self): + aliases = PathAliases() + aliases.add('X:\\', '/tmp/src') + self.assert_mapped( + aliases, + "X:\\a\\file.py", + "/tmp/src/a/file.py" + ) + self.assert_mapped( + aliases, + "X:\\file.py", + "/tmp/src/file.py" + ) + def test_leading_wildcard(self): aliases = PathAliases() aliases.add('*/d1', './mysrc1') |