From 0804470e7ada1bedd2693c45ac6a5338f6b7bbba Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Tue, 6 Aug 2019 12:37:09 -0400 Subject: [PATCH] Use a different pytest contexts flag name to not conflict with the in-process version --- openedx/testing/coverage_context_listener/pytest_plugin.py | 4 ++-- scripts/generic-ci-tests.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openedx/testing/coverage_context_listener/pytest_plugin.py b/openedx/testing/coverage_context_listener/pytest_plugin.py index 1e735014e7..a3a27cb134 100644 --- a/openedx/testing/coverage_context_listener/pytest_plugin.py +++ b/openedx/testing/coverage_context_listener/pytest_plugin.py @@ -44,8 +44,8 @@ def pytest_configure(config): def pytest_addoption(parser): group = parser.getgroup("coverage") group.addoption( - "--pytest-contexts", + "--pytest-remote-contexts", action="store_true", dest="pytest-contexts", - help="Capture the pytest contexts that coverage is being captured in", + help="Capture the pytest contexts that coverage is being captured in in another process", ) diff --git a/scripts/generic-ci-tests.sh b/scripts/generic-ci-tests.sh index 9f3fa82a0d..77d89f91e7 100755 --- a/scripts/generic-ci-tests.sh +++ b/scripts/generic-ci-tests.sh @@ -179,7 +179,7 @@ case "$TEST_SUITE" in PAVER_ARGS="$PAVER_ARGS --with-wtw=origin/master" fi if [[ -n "$COLLECT_WHO_TESTS_WHAT" ]]; then - PAVER_ARGS="$PAVER_ARGS --pytest-contexts --coveragerc=common/test/acceptance/.coveragerc" + PAVER_ARGS="$PAVER_ARGS --pytest-remote-contexts --coveragerc=common/test/acceptance/.coveragerc" fi export BOKCHOY_HEADLESS=true