From 0b40c9045e8a96c33a0d3cedbddb2aa99fc06819 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Tue, 26 Nov 2019 15:30:33 -0500 Subject: [PATCH 1/2] Add environment variables that coverage needs. These are used in the coveragerc to referr to equivalent paths for when combining coverage files. --- tox.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tox.ini b/tox.ini index 628cfa44f4..b173de3975 100644 --- a/tox.ini +++ b/tox.ini @@ -63,6 +63,8 @@ passenv = PYTHON_VERSION LMS_CFG STUDIO_CFG + JOB_NAME + SUBSET_JOB deps = django111: -r requirements/edx/django.txt From 77c5ba62a2c0ea7efd49de535ed3961a721f6638 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Tue, 26 Nov 2019 15:31:48 -0500 Subject: [PATCH 2/2] Sort tox passenvs. --- tox.ini | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tox.ini b/tox.ini index b173de3975..5be73e5f57 100644 --- a/tox.ini +++ b/tox.ini @@ -27,20 +27,23 @@ setenv = TOXENV={envname} passenv = BOK_CHOY_CMS_PORT + BOKCHOY_HEADLESS BOK_CHOY_HOSTNAME BOK_CHOY_LMS_PORT - BOKCHOY_HEADLESS DISABLE_COURSEENROLLMENT_HISTORY DISPLAY DJANGO_SETTINGS_MODULE - EDX_PLATFORM_SETTINGS EDXAPP_TEST_MONGO_HOST + EDX_PLATFORM_SETTINGS + JOB_NAME + LMS_CFG MOZ_HEADLESS - NO_PREREQ_INSTALL - NO_PYTHON_UNINSTALL NODE_PATH NODE_VIRTUAL_ENV + NO_PREREQ_INSTALL + NO_PYTHON_UNINSTALL NPM_CONFIG_PREFIX + PYTHON_VERSION SCRAPY_SETTINGS_MODULE SELENIUM_BROWSER SELENIUM_HOST @@ -48,6 +51,8 @@ passenv = SHARD SKIP_NPM_INSTALL SSH_AUTH_SOCK + STUDIO_CFG + SUBSET_JOB TARGET_BRANCH TEST_SUITE XDIST_GIT_BRANCH @@ -60,11 +65,6 @@ passenv = XDIST_WORKER_KEY_NAME XDIST_WORKER_SECURITY_GROUP XDIST_WORKER_SUBNET - PYTHON_VERSION - LMS_CFG - STUDIO_CFG - JOB_NAME - SUBSET_JOB deps = django111: -r requirements/edx/django.txt