diff options
| -rw-r--r-- | CHANGES.txt | 6 | ||||
| -rw-r--r-- | tests/test_data.py | 18 |
2 files changed, 15 insertions, 9 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 1871b3b4..17122083 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -6,6 +6,11 @@ Change history for Coverage.py Latest ------ +- The ``coverage combine`` command now accepts any number of directories as + arguments, and will combine all the data files from those directories. This + means you don't have to copy the files to one directory before combining. + Thanks, Christine Lytwynec. Finishes `issue 354`_. + - Branch coverage couldn't properly handle certain extremely long files. This is now fixed (`issue 359`_). @@ -28,6 +33,7 @@ Latest .. _issue 299: https://bitbucket.org/ned/coveragepy/issue/299/inserted-created-on-yyyy-mm-dd-hh-mm-in .. _issue 308: https://bitbucket.org/ned/coveragepy/issue/308/yield-lambda-branch-coverage .. _issue 324: https://bitbucket.org/ned/coveragepy/issue/324/yield-in-loop-confuses-branch-coverage +.. _issue 354: https://bitbucket.org/ned/coveragepy/issue/354/coverage-combine-should-take-a-list-of .. _issue 359: https://bitbucket.org/ned/coveragepy/issue/359/xml-report-chunk-error .. _issue 360: https://bitbucket.org/ned/coveragepy/issue/360/html-reports-get-confused-by-l-in-the-code .. _issue 361: https://bitbucket.org/ned/coveragepy/issue/361/use-double-quotes-in-html-output-to diff --git a/tests/test_data.py b/tests/test_data.py index ef57f0cb..e2f8150b 100644 --- a/tests/test_data.py +++ b/tests/test_data.py @@ -1,7 +1,6 @@ """Tests for coverage.data""" import os -import shutil from coverage.backward import pickle from coverage.data import CoverageData @@ -39,10 +38,8 @@ X_PY_ARCS_3 = [(1, 2), (2, 3)] Y_PY_ARCS_3 = [(17, 23)] -class DataTest(CoverageTest): - """Test cases for coverage.data.""" - - run_in_temp_dir = False +class DataTestHelpers(CoverageTest): + """Test helpers for data tests.""" def assert_summary(self, covdata, summary, fullpath=False): """Check that the summary of `covdata` is `summary`.""" @@ -52,6 +49,12 @@ class DataTest(CoverageTest): """Check that `covdata`'s measured files are `measured`.""" self.assertCountEqual(covdata.measured_files(), measured) + +class DataTest(DataTestHelpers, CoverageTest): + """Test cases for coverage.data.""" + + run_in_temp_dir = False + def test_reading_empty(self): covdata = CoverageData() covdata.read() @@ -159,11 +162,9 @@ class DataTest(CoverageTest): self.assert_measured_files(covdata3, ['./a.py', './sub/b.py']) -class DataTestInTempDir(DataTest): +class DataTestInTempDir(DataTestHelpers, CoverageTest): """Test cases for coverage.data.""" - run_in_temp_dir = True - def test_combining_from_different_directories(self): covdata1 = CoverageData() covdata1.add_line_data(DATA_1) @@ -183,4 +184,3 @@ class DataTestInTempDir(DataTest): self.assert_summary(covdata3, SUMMARY_1_2) self.assert_measured_files(covdata3, MEASURED_FILES_1_2) - |