From c3434d144d7c1801c6b010ef6a9ff54b48edbeaf Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Wed, 29 Jun 2016 09:56:26 -0400 Subject: [PATCH 1/2] Remove another instance of self.pdb --- pavelib/utils/test/suites/suite.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pavelib/utils/test/suites/suite.py b/pavelib/utils/test/suites/suite.py index f11bb62498..dfe34a97c7 100644 --- a/pavelib/utils/test/suites/suite.py +++ b/pavelib/utils/test/suites/suite.py @@ -27,7 +27,6 @@ class TestSuite(object): self.failed_suites = [] self.verbosity = int(kwargs.get('verbosity', 1)) self.skip_clean = kwargs.get('skip_clean', False) - self.pdb = kwargs.get('pdb', False) self.passthrough_options = kwargs.get('passthrough_options', []) def __enter__(self): From 88d826cfb285350bae1ebb5ee9f0e5a68276c05c Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Wed, 29 Jun 2016 10:31:33 -0400 Subject: [PATCH 2/2] Allow the diff_coverage command to share options with the coverage command --- pavelib/tests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pavelib/tests.py b/pavelib/tests.py index c56f247dce..ffcf7668fe 100644 --- a/pavelib/tests.py +++ b/pavelib/tests.py @@ -267,7 +267,7 @@ def coverage(options): sh("coverage xml --rcfile={}".format(rcfile)) # Generate the coverage.py HTML report sh("coverage html --rcfile={}".format(rcfile)) - call_task('diff_coverage', options=options.coverage) + diff_coverage() # pylint: disable=no-value-for-parameter @task @@ -275,12 +275,12 @@ def coverage(options): @cmdopts([ ("compare-branch=", "b", "Branch to compare against, defaults to origin/master"), ("compare_branch=", None, "deprecated in favor of compare-branch"), -]) +], share_with=['coverage']) def diff_coverage(options): """ Build the diff coverage reports """ - compare_branch = options.diff_coverage.get('compare_branch', 'origin/master') + compare_branch = options.get('compare_branch', 'origin/master') # Find all coverage XML files (both Python and JavaScript) xml_reports = []