From da6d70a92bb1eb5c8a497e758d4ceb8457d9ac7d Mon Sep 17 00:00:00 2001 From: Christine Lytwynec Date: Thu, 5 Jun 2014 11:18:17 -0400 Subject: [PATCH] updating diff-cover, adding --compare-branch feature to paver task --- pavelib/tests.py | 28 +++++++++++++++++++++++++--- requirements/edx/github.txt | 2 +- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/pavelib/tests.py b/pavelib/tests.py index c992d4f277..150e2c8a2c 100644 --- a/pavelib/tests.py +++ b/pavelib/tests.py @@ -146,10 +146,15 @@ def test(): @task @needs('pavelib.prereqs.install_prereqs') -def coverage(): +@cmdopts([ + ("compare_branch", "b", "Branch to compare against, defaults to origin/master"), +]) +def coverage(options): """ Build the html, xml, and diff coverage reports """ + compare_branch = getattr(options, 'compare_branch', 'origin/master') + for directory in Env.LIB_TEST_DIRS + ['cms', 'lms']: report_dir = Env.REPORT_DIR / directory @@ -181,7 +186,24 @@ def coverage(): diff_html_path = os.path.join(Env.REPORT_DIR, 'diff_coverage_combined.html') # Generate the diff coverage reports (HTML and console) - sh("diff-cover {xml_report_str} --html-report {diff_html_path}".format( - xml_report_str=xml_report_str, diff_html_path=diff_html_path)) + sh("diff-cover {xml_report_str}".format(xml_report_str=xml_report_str)) + + sh( + "diff-cover {xml_report_str} --compare-branch={compare_branch} " + "--html-report {diff_html_path}".format( + xml_report_str=xml_report_str, + compare_branch=compare_branch, + diff_html_path=diff_html_path, + ) + ) + + sh( + "diff-cover {xml_report_str} --compare-branch=" + "{compare_branch}".format( + xml_report_str=xml_report_str, + compare_branch=compare_branch, + ) + ) + print("\n") diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index d5bc5ec1df..5b800b3f71 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -19,7 +19,7 @@ # Our libraries: -e git+https://github.com/edx/XBlock.git@fc5fea25c973ec66d8db63cf69a817ce624f5ef5#egg=XBlock -e git+https://github.com/edx/codejail.git@71f5c5616e2a73ae8cecd1ff2362774a773d3665#egg=codejail --e git+https://github.com/edx/diff-cover.git@v0.2.9#egg=diff_cover +-e git+https://github.com/edx/diff-cover.git@v0.4.1#egg=diff_cover -e git+https://github.com/edx/js-test-tool.git@v0.1.5#egg=js_test_tool -e git+https://github.com/edx/django-waffle.git@823a102e48#egg=django-waffle -e git+https://github.com/edx/event-tracking.git@0.1.0#egg=event-tracking