summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2019-12-22 09:04:12 -0500
committerNed Batchelder <ned@nedbatchelder.com>2019-12-22 09:04:12 -0500
commitd66d496b53e3fd8ba891a2704d82e0b6a0be1502 (patch)
tree3dfffdb2fb9db839b78173e5f016ae935f7afb96
parent77dc37fca441705dd6f8560a3f57cad13ee43302 (diff)
downloadpython-coveragepy-git-d66d496b53e3fd8ba891a2704d82e0b6a0be1502.tar.gz
Don't need to check for JSON-era bad-data messages any more
-rw-r--r--tests/test_api.py5
-rw-r--r--tests/test_process.py10
2 files changed, 0 insertions, 15 deletions
diff --git a/tests/test_api.py b/tests/test_api.py
index 93b6dc9a..8fa81d07 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -395,12 +395,7 @@ class ApiTest(CoverageTest):
self.make_bad_data_file()
cov = coverage.Coverage()
warning_regex = (
- r"(" # JSON message:
- r"Couldn't read data from '.*\.coverage\.foo': "
- r"CoverageException: Doesn't seem to be a coverage\.py data file"
- r"|" # SQL message:
r"Couldn't use data file '.*\.coverage\.foo': file (is encrypted or )?is not a database"
- r")"
)
with self.assert_warnings(cov, [warning_regex]):
cov.combine()
diff --git a/tests/test_process.py b/tests/test_process.py
index 4a1e6348..29fbfb35 100644
--- a/tests/test_process.py
+++ b/tests/test_process.py
@@ -130,13 +130,8 @@ class ProcessTest(CoverageTest):
self.assert_exists(".coverage")
self.assert_exists(".coverage.bad")
warning_regex = (
- r"(" # JSON message:
- r"Coverage.py warning: Couldn't read data from '.*\.coverage\.bad': "
- r"CoverageException: Doesn't seem to be a coverage\.py data file"
- r"|" # SQL message:
r"Coverage.py warning: Couldn't use data file '.*\.coverage\.bad': "
r"file (is encrypted or )?is not a database"
- r")"
)
self.assertRegex(out, warning_regex)
@@ -168,13 +163,8 @@ class ProcessTest(CoverageTest):
for n in "12":
self.assert_exists(".coverage.bad{}".format(n))
warning_regex = (
- r"(" # JSON message:
- r"Coverage.py warning: Couldn't read data from '.*\.coverage\.bad{0}': "
- r"CoverageException: Doesn't seem to be a coverage\.py data file"
- r"|" # SQL message:
r"Coverage.py warning: Couldn't use data file '.*\.coverage.bad{0}': "
r"file (is encrypted or )?is not a database"
- r")"
.format(n)
)
self.assertRegex(out, warning_regex)