diff options
-rw-r--r-- | coverage/html.py | 2 | ||||
-rw-r--r-- | test/test_process.py | 28 | ||||
-rw-r--r-- | test/test_summary.py | 4 |
3 files changed, 19 insertions, 15 deletions
diff --git a/coverage/html.py b/coverage/html.py index 65bc25e..6994711 100644 --- a/coverage/html.py +++ b/coverage/html.py @@ -7,6 +7,7 @@ from coverage.backward import pickle from coverage.misc import CoverageException, Hasher from coverage.phystokens import source_token_lines, source_encoding from coverage.report import Reporter +from coverage.results import Numbers from coverage.templite import Templite # Disable pylint msg W0612, because a bunch of variables look unused, but @@ -59,6 +60,7 @@ class HtmlReporter(Reporter): self.arcs = self.coverage.data.has_arcs() self.status = HtmlStatus() self.extra_css = None + self.totals = Numbers() def report(self, morfs): """Generate an HTML report for `morfs`. diff --git a/test/test_process.py b/test/test_process.py index 9f8aacc..c113494 100644 --- a/test/test_process.py +++ b/test/test_process.py @@ -395,23 +395,23 @@ class FailUnderTest(CoverageTest): b = 3 c = 4 """) - status, out = self.run_command_status("coverage run fifty.py", 0) - self.assertEqual(status, 0) + st, _ = self.run_command_status("coverage run fifty.py", 0) + self.assertEqual(st, 0) def test_report(self): - status, out = self.run_command_status("coverage report --fail-under=50", 0) - self.assertEqual(status, 0) - status, out = self.run_command_status("coverage report --fail-under=51", 2) - self.assertEqual(status, 2) + st, _ = self.run_command_status("coverage report --fail-under=50", 0) + self.assertEqual(st, 0) + st, _ = self.run_command_status("coverage report --fail-under=51", 2) + self.assertEqual(st, 2) def test_html_report(self): - status, out = self.run_command_status("coverage html --fail-under=50", 0) - self.assertEqual(status, 0) - status, out = self.run_command_status("coverage html --fail-under=51", 2) - self.assertEqual(status, 2) + st, _ = self.run_command_status("coverage html --fail-under=50", 0) + self.assertEqual(st, 0) + st, _ = self.run_command_status("coverage html --fail-under=51", 2) + self.assertEqual(st, 2) def test_xml_report(self): - status, out = self.run_command_status("coverage xml --fail-under=50", 0) - self.assertEqual(status, 0) - status, out = self.run_command_status("coverage xml --fail-under=51", 2) - self.assertEqual(status, 2) + st, _ = self.run_command_status("coverage xml --fail-under=50", 0) + self.assertEqual(st, 0) + st, _ = self.run_command_status("coverage xml --fail-under=51", 2) + self.assertEqual(st, 2) diff --git a/test/test_summary.py b/test/test_summary.py index 9db8e4e..08f7fa9 100644 --- a/test/test_summary.py +++ b/test/test_summary.py @@ -212,7 +212,10 @@ class SummaryTest2(CoverageTest): class ReportingReturnValue(CoverageTest): + """Tests of reporting functions returning values.""" + def run_coverage(self): + """Run coverage on doit.py and return the coverage object.""" self.make_file("doit.py", """\ a = 1 b = 2 @@ -231,7 +234,6 @@ class ReportingReturnValue(CoverageTest): def test_report(self): cov = self.run_coverage() - repout = StringIO() val = cov.report(include="*/doit.py") self.assertAlmostEqual(val, 85.7, 1) |