From c94e6c0a0786cccce285b737c2f40227e21e8559 Mon Sep 17 00:00:00 2001 From: Ihor Kalnytskyi Date: Fri, 5 May 2017 16:29:07 +0300 Subject: [PATCH] Reuse testenv env variables in py27/py34 envs Due to Tox override mechanism, both py27 and py34 envs do not pass env variables defined in testenv to tox_install.sh script. Hence, BRANCH_NAME is not defined and master code of Horizon is always installed. While it's not critical for sahara-dashboard master branch, it's crucial for stable branches, especially stable/newton where running tox -e py27 fails due to fresh Horizon and old its dependencies. This patch adds inheritance for py27 and py34 envs, so the env variables defined in testenv will be also defined in these both envs. Change-Id: I246049d29024b64b50dcdc153a809c9649716287 --- tox.ini | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 6beb1058..ba3f90c9 100644 --- a/tox.ini +++ b/tox.ini @@ -17,10 +17,14 @@ whitelist_externals = /bin/bash commands = /bin/bash run_tests.sh -N --no-pep8 {posargs} [testenv:py27] -setenv = DJANGO_SETTINGS_MODULE=sahara_dashboard.test.settings +setenv = + {[testenv]setenv} + DJANGO_SETTINGS_MODULE=sahara_dashboard.test.settings [testenv:py34] -setenv = DJANGO_SETTINGS_MODULE=sahara_dashboard.test.settings +setenv = + {[testenv]setenv} + DJANGO_SETTINGS_MODULE=sahara_dashboard.test.settings [testenv:pep8] commands = flake8