summaryrefslogtreecommitdiff
path: root/tests/test_data.py
diff options
context:
space:
mode:
authorNed Batchelder <nedbat@gmail.com>2015-07-30 07:14:54 -0400
committerNed Batchelder <nedbat@gmail.com>2015-07-30 07:14:54 -0400
commit31f58b1165dd67d443b1e5fd0403574774a23bfc (patch)
tree06bb807d8a377c95156bdc812c76be6819b50cf1 /tests/test_data.py
parent07233cf423384d0a5bb819382d2005e49d9d945c (diff)
parentc302b891209baf67abcdb1d49896397deea46f67 (diff)
downloadpython-coveragepy-git-31f58b1165dd67d443b1e5fd0403574774a23bfc.tar.gz
Merged in atodorov/coverage.py/combine_files_and_dirs (pull request #62)
Extend combine parameters to allow for file names and shell globs
Diffstat (limited to 'tests/test_data.py')
-rw-r--r--tests/test_data.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test_data.py b/tests/test_data.py
index ce49bcbf..a67a27ca 100644
--- a/tests/test_data.py
+++ b/tests/test_data.py
@@ -686,6 +686,6 @@ class CoverageDataFilesTest(DataTestHelpers, CoverageTest):
def test_combining_from_nonexistent_directories(self):
covdata = CoverageData()
- msg = "Couldn't combine from non-existent directory 'xyzzy'"
+ msg = "Couldn't combine from non-existing path 'xyzzy'"
with self.assertRaisesRegex(CoverageException, msg):
self.data_files.combine_parallel_data(covdata, data_dirs=['xyzzy'])