diff options
| author | RUANG (James Roy) <longjinyii@outlook.com> | 2024-12-03 22:33:13 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-03 22:33:13 (GMT) |
| commit | 12397a5781664bf43da98454db07cdfdec3ab815 (patch) | |
| tree | c9b6b1c279e4f71a73e2807f71f403ed59008850 /Lib | |
| parent | dabcecfd6dadb9430733105ba36925b290343d31 (diff) | |
| download | cpython-12397a5781664bf43da98454db07cdfdec3ab815.zip cpython-12397a5781664bf43da98454db07cdfdec3ab815.tar.gz cpython-12397a5781664bf43da98454db07cdfdec3ab815.tar.bz2 | |
gh-112192: Increase the trace module coverage precision to one decimal (#126972)
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_regrtest.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_trace.py | 4 | ||||
| -rw-r--r-- | Lib/trace.py | 7 |
3 files changed, 6 insertions, 7 deletions
diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py index d4f4a69..0ab7a23 100644 --- a/Lib/test/test_regrtest.py +++ b/Lib/test/test_regrtest.py @@ -1138,7 +1138,7 @@ class ArgsTestCase(BaseTestCase): output = self.run_tests("--coverage", test) self.check_executed_tests(output, [test], stats=1) regex = (r'lines +cov% +module +\(path\)\n' - r'(?: *[0-9]+ *[0-9]{1,2}% *[^ ]+ +\([^)]+\)+)+') + r'(?: *[0-9]+ *[0-9]{1,2}\.[0-9]% *[^ ]+ +\([^)]+\)+)+') self.check_line(output, regex) def test_wait(self): diff --git a/Lib/test/test_trace.py b/Lib/test/test_trace.py index 93966ee..e7e4253 100644 --- a/Lib/test/test_trace.py +++ b/Lib/test/test_trace.py @@ -412,7 +412,7 @@ class TestCoverage(unittest.TestCase): coverage = {} for line in stdout: lines, cov, module = line.split()[:3] - coverage[module] = (int(lines), int(cov[:-1])) + coverage[module] = (float(lines), float(cov[:-1])) # XXX This is needed to run regrtest.py as a script modname = trace._fullmodname(sys.modules[modname].__file__) self.assertIn(modname, coverage) @@ -553,7 +553,7 @@ class TestCommandLine(unittest.TestCase): stdout = stdout.decode() self.assertEqual(status, 0) self.assertIn('lines cov% module (path)', stdout) - self.assertIn(f'6 100% {modulename} ({filename})', stdout) + self.assertIn(f'6 100.0% {modulename} ({filename})', stdout) def test_run_as_module(self): assert_python_ok('-m', 'trace', '-l', '--module', 'timeit', '-n', '1') diff --git a/Lib/trace.py b/Lib/trace.py index bb3d34f..a87bc6d 100644 --- a/Lib/trace.py +++ b/Lib/trace.py @@ -279,14 +279,13 @@ class CoverageResults: n_hits, n_lines = self.write_results_file(coverpath, source, lnotab, count, encoding) if summary and n_lines: - percent = int(100 * n_hits / n_lines) - sums[modulename] = n_lines, percent, modulename, filename + sums[modulename] = n_lines, n_hits, modulename, filename if summary and sums: print("lines cov% module (path)") for m in sorted(sums): - n_lines, percent, modulename, filename = sums[m] - print("%5d %3d%% %s (%s)" % sums[m]) + n_lines, n_hits, modulename, filename = sums[m] + print(f"{n_lines:5d} {n_hits/n_lines:.1%} {modulename} ({filename})") if self.outfile: # try and store counts and module info into self.outfile |