From 2b7324f3a0ed1e1b4dadec5941aa71636b0f46d3 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Sat, 4 Mar 2017 18:30:33 -0500 Subject: Move the logic for fail-under to a testable function --- coverage/cmdline.py | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'coverage/cmdline.py') diff --git a/coverage/cmdline.py b/coverage/cmdline.py index ce929f48..97acdc42 100644 --- a/coverage/cmdline.py +++ b/coverage/cmdline.py @@ -12,9 +12,10 @@ import traceback from coverage import env from coverage.collector import CTracer +from coverage.debug import info_formatter, info_header from coverage.execfile import run_python_file, run_python_module from coverage.misc import BaseCoverageException, ExceptionDuringRun, NoSource -from coverage.debug import info_formatter, info_header +from coverage.results import should_fail_under class Opts(object): @@ -522,18 +523,8 @@ class CoverageScript(object): if options.fail_under is not None: self.coverage.set_option("report:fail_under", options.fail_under) - if self.coverage.get_option("report:fail_under"): - # Total needs to be rounded, but don't want to report 100 - # unless it is really 100. - if 99 < total < 100: - total = 99 - else: - total = round(total) - - if total >= self.coverage.get_option("report:fail_under"): - return OK - else: - return FAIL_UNDER + if should_fail_under(self.coverage, total): + return FAIL_UNDER return OK -- cgit v1.2.1