diff options
| -rw-r--r-- | tests/test_process.py | 38 | ||||
| -rw-r--r-- | tests/test_results.py | 25 |
2 files changed, 24 insertions, 39 deletions
diff --git a/tests/test_process.py b/tests/test_process.py index da74d063..3c0eed04 100644 --- a/tests/test_process.py +++ b/tests/test_process.py @@ -1051,44 +1051,6 @@ class FailUnderEmptyFilesTest(CoverageTest): self.assertEqual(st, 2) -class FailUnder100Test(CoverageTest): - """Tests of the --fail-under switch.""" - - def test_99_8(self): - self.make_file("ninety_nine_eight.py", - "".join("v{i} = {i}\n".format(i=i) for i in range(498)) + - "if v0 > 498:\n v499 = 499\n" - ) - st, _ = self.run_command_status("coverage run ninety_nine_eight.py") - self.assertEqual(st, 0) - st, out = self.run_command_status("coverage report") - self.assertEqual(st, 0) - self.assertEqual( - self.last_line_squeezed(out), - "ninety_nine_eight.py 500 1 99%" - ) - - st, _ = self.run_command_status("coverage report --fail-under=100") - self.assertEqual(st, 2) - - - def test_100(self): - self.make_file("one_hundred.py", - "".join("v{i} = {i}\n".format(i=i) for i in range(500)) - ) - st, _ = self.run_command_status("coverage run one_hundred.py") - self.assertEqual(st, 0) - st, out = self.run_command_status("coverage report") - self.assertEqual(st, 0) - self.assertEqual( - self.last_line_squeezed(out), - "one_hundred.py 500 0 100%" - ) - - st, _ = self.run_command_status("coverage report --fail-under=100") - self.assertEqual(st, 0) - - class UnicodeFilePathsTest(CoverageTest): """Tests of using non-ascii characters in the names of files.""" diff --git a/tests/test_results.py b/tests/test_results.py index c4d8ae5a..280694d0 100644 --- a/tests/test_results.py +++ b/tests/test_results.py @@ -3,7 +3,10 @@ """Tests for coverage.py's results analysis.""" -from coverage.results import Numbers +import pytest + +from coverage.results import Numbers, should_fail_under + from tests.coveragetest import CoverageTest @@ -73,3 +76,23 @@ class NumbersTest(CoverageTest): n_branches=10, n_missing_branches=3, n_partial_branches=1000, ) self.assertEqual(n.ratio_covered, (160, 210)) + + +@pytest.mark.parametrize("total, fail_under, result", [ + # fail_under==0 means anything is fine! + (0, 0, False), + (0.001, 0, False), + # very small fail_under is possible to fail. + (0.001, 0.01, True), + # Rounding should work properly. + (42.1, 42, False), + (42.1, 43, True), + (42.857, 42, False), + (42.857, 43, False), + (42.857, 44, True), + # Values near 100 should only be treated as 100 if they are 100. + (99.8, 100, True), + (100.0, 100, False), +]) +def test_should_fail_under(total, fail_under, result): + assert should_fail_under(total, fail_under) == result |