summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2021-10-10 11:58:26 -0400
committerNed Batchelder <ned@nedbatchelder.com>2021-10-10 11:58:26 -0400
commite54b7576a35b3dd4642788cff557a2ccebf7582b (patch)
tree3369a7d4372a1d20ec100a05d7f732184b2e86b6
parent036baa78a006c061862ed2e16db51a2f8be7b29e (diff)
downloadpython-coveragepy-git-e54b7576a35b3dd4642788cff557a2ccebf7582b.tar.gz
refactor: no need for maybe-u prefixes in test regexes
That was for Python 2, which we don't support anymore.
-rw-r--r--tests/test_config.py6
-rw-r--r--tests/test_data.py10
-rw-r--r--tests/test_html.py2
-rw-r--r--tests/test_process.py4
4 files changed, 11 insertions, 11 deletions
diff --git a/tests/test_config.py b/tests/test_config.py
index aec18bf2..c2874188 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -190,14 +190,14 @@ class ConfigTest(CoverageTest):
("[tool.coverage.run]\ntimid = \"maybe?\"\n", r"maybe[?]"),
("[tool.coverage.run\n", None),
('[tool.coverage.report]\nexclude_lines = ["foo("]\n',
- r"Invalid \[tool.coverage.report\].exclude_lines value u?'foo\(': " +
+ r"Invalid \[tool.coverage.report\].exclude_lines value 'foo\(': " +
r"(unbalanced parenthesis|missing \))"),
('[tool.coverage.report]\npartial_branches = ["foo["]\n',
- r"Invalid \[tool.coverage.report\].partial_branches value u?'foo\[': " +
+ r"Invalid \[tool.coverage.report\].partial_branches value 'foo\[': " +
r"(unexpected end of regular expression|unterminated character set)"),
('[tool.coverage.report]\npartial_branches_always = ["foo***"]\n',
r"Invalid \[tool.coverage.report\].partial_branches_always value " +
- r"u?'foo\*\*\*': " +
+ r"'foo\*\*\*': " +
r"multiple repeat"),
('[tool.coverage.run]\nconcurrency="foo"', "not a list"),
("[tool.coverage.report]\nprecision=1.23", "not an integer"),
diff --git a/tests/test_data.py b/tests/test_data.py
index 86b3870e..a1689ad6 100644
--- a/tests/test_data.py
+++ b/tests/test_data.py
@@ -314,7 +314,7 @@ class CoverageDataTest(CoverageTest):
covdata.add_lines({"p1.foo": dict.fromkeys([1, 2, 3])})
covdata.add_file_tracers({"p1.foo": "p1.plugin"})
- msg = "Conflicting file tracer name for 'p1.foo': u?'p1.plugin' vs u?'p1.plugin.foo'"
+ msg = "Conflicting file tracer name for 'p1.foo': 'p1.plugin' vs 'p1.plugin.foo'"
with pytest.raises(CoverageException, match=msg):
covdata.add_file_tracers({"p1.foo": "p1.plugin.foo"})
@@ -401,11 +401,11 @@ class CoverageDataTest(CoverageTest):
covdata2.add_lines({"p1.html": dict.fromkeys([1, 2, 3])})
covdata2.add_file_tracers({"p1.html": "html.other_plugin"})
- msg = "Conflicting file tracer name for 'p1.html': u?'html.plugin' vs u?'html.other_plugin'"
+ msg = "Conflicting file tracer name for 'p1.html': 'html.plugin' vs 'html.other_plugin'"
with pytest.raises(CoverageException, match=msg):
covdata1.update(covdata2)
- msg = "Conflicting file tracer name for 'p1.html': u?'html.other_plugin' vs u?'html.plugin'"
+ msg = "Conflicting file tracer name for 'p1.html': 'html.other_plugin' vs 'html.plugin'"
with pytest.raises(CoverageException, match=msg):
covdata2.update(covdata1)
@@ -417,11 +417,11 @@ class CoverageDataTest(CoverageTest):
covdata2 = DebugCoverageData(suffix="2")
covdata2.add_lines({"p1.html": dict.fromkeys([1, 2, 3])})
- msg = "Conflicting file tracer name for 'p1.html': u?'html.plugin' vs u?''"
+ msg = "Conflicting file tracer name for 'p1.html': 'html.plugin' vs ''"
with pytest.raises(CoverageException, match=msg):
covdata1.update(covdata2)
- msg = "Conflicting file tracer name for 'p1.html': u?'' vs u?'html.plugin'"
+ msg = "Conflicting file tracer name for 'p1.html': '' vs 'html.plugin'"
with pytest.raises(CoverageException, match=msg):
covdata2.update(covdata1)
diff --git a/tests/test_html.py b/tests/test_html.py
index f5908d7b..7368cdb1 100644
--- a/tests/test_html.py
+++ b/tests/test_html.py
@@ -607,7 +607,7 @@ class HtmlStaticFileTest(CoverageTest):
self.make_file("main.py", "print(17)")
cov = coverage.Coverage()
self.start_import_stop(cov, "main")
- msg = "Couldn't find static file u?'.*'"
+ msg = "Couldn't find static file '.*'"
with pytest.raises(CoverageException, match=msg):
cov.html_report()
diff --git a/tests/test_process.py b/tests/test_process.py
index 1adb6cff..6c5dd76b 100644
--- a/tests/test_process.py
+++ b/tests/test_process.py
@@ -1788,11 +1788,11 @@ class VirtualenvTest(CoverageTest):
print(re_lines(debug_out, "myproduct"))
assert re_lines(
debug_out,
- r"^Not tracing .*\bmyproduct.py': module u?'myproduct' falls outside the --source spec"
+ r"^Not tracing .*\bmyproduct.py': module 'myproduct' falls outside the --source spec"
)
assert re_lines(
debug_out,
- r"^Not tracing .*\bcolorsys.py': module u?'colorsys' falls outside the --source spec"
+ r"^Not tracing .*\bcolorsys.py': module 'colorsys' falls outside the --source spec"
)
out = run_in_venv("python -m coverage report")