diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_api.py | 17 | ||||
| -rw-r--r-- | tests/test_cmdline.py | 14 | ||||
| -rw-r--r-- | tests/test_config.py | 5 | ||||
| -rw-r--r-- | tests/test_process.py | 2 |
4 files changed, 8 insertions, 30 deletions
diff --git a/tests/test_api.py b/tests/test_api.py index ad322224..a7cadab3 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -305,19 +305,8 @@ class ApiTest(CoverageTest): self.make_file(".coverage.foo", """La la la, this isn't coverage data!""") def test_combining_corrupt_data(self): - self.make_corrupt_data_files() - cov = coverage.Coverage() - - msg = r"Couldn't read data from '.*\.coverage\.foo'" - with self.assertRaisesRegex(CoverageException, msg): - cov.combine() - - # The bad file still exists. - self.assert_exists(".coverage.foo") - - def test_combining_corrupt_data_while_ignoring_errors(self): - # If you combine a corrupt data file with ignore_errors=True, then you - # will get a warning, and the file will remain. + # If you combine a corrupt data file, then you will get a warning, + # and the file will remain. self.make_corrupt_data_files() cov = coverage.Coverage() warning_regex = ( @@ -325,7 +314,7 @@ class ApiTest(CoverageTest): r"CoverageException: Doesn't seem to be a coverage\.py data file" ) with self.assert_warnings(cov, [warning_regex]): - cov.combine(ignore_errors=True) + cov.combine() # We got the results from code1 and code2 properly. self.check_code1_code2(cov) diff --git a/tests/test_cmdline.py b/tests/test_cmdline.py index 932c9ef9..c78e3468 100644 --- a/tests/test_cmdline.py +++ b/tests/test_cmdline.py @@ -190,20 +190,14 @@ class CmdLineTest(BaseCmdLineTest): self.cmd_executes("combine datadir1", """\ .coverage() .load() - .combine(["datadir1"], ignore_errors=None) + .combine(["datadir1"]) .save() """) # coverage combine without args self.cmd_executes("combine", """\ .coverage() .load() - .combine(None, ignore_errors=None) - .save() - """) - self.cmd_executes("combine -i", """\ - .coverage() - .load() - .combine(None, ignore_errors=True) + .combine(None) .save() """) @@ -212,13 +206,13 @@ class CmdLineTest(BaseCmdLineTest): self.cmd_executes("combine --rcfile cov.ini", """\ .coverage(config_file='cov.ini') .load() - .combine(None, ignore_errors=None) + .combine(None) .save() """) self.cmd_executes("combine --rcfile cov.ini data1 data2/more", """\ .coverage(config_file='cov.ini') .load() - .combine(["data1", "data2/more"], ignore_errors=None) + .combine(["data1", "data2/more"]) .save() """) diff --git a/tests/test_config.py b/tests/test_config.py index 6d6c7f80..93a7bbf6 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -235,9 +235,6 @@ class ConfigFileTest(CoverageTest): plugins.a_plugin plugins.another - [{section}combine] - ignore_errors = True - [{section}report] ; these settings affect reporting. exclude_lines = @@ -304,8 +301,6 @@ class ConfigFileTest(CoverageTest): self.assertTrue(cov.config.parallel) self.assertEqual(cov.config.concurrency, "thread") - self.assertTrue(cov.config.ignore_combine_errors) - self.assertEqual(cov.get_exclude_list(), ["if 0:", r"pragma:?\s+no cover", "another_tab"]) self.assertTrue(cov.config.ignore_errors) self.assertEqual(cov.config.include, ["a/", "b/"]) diff --git a/tests/test_process.py b/tests/test_process.py index b41472d6..4902f7c0 100644 --- a/tests/test_process.py +++ b/tests/test_process.py @@ -112,7 +112,7 @@ class ProcessTest(CoverageTest): self.make_file(".coverage.bad", "This isn't a coverage data file.") # Combine the parallel coverage data files into .coverage . - out = self.run_command("coverage combine -i") + out = self.run_command("coverage combine") self.assert_exists(".coverage") self.assert_exists(".coverage.bad") warning_regex = ( |