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
This commit is contained in:
parent
238e8bdd40
commit
c94e6c0a07
8
tox.ini
8
tox.ini
@ -17,10 +17,14 @@ whitelist_externals = /bin/bash
|
|||||||
commands = /bin/bash run_tests.sh -N --no-pep8 {posargs}
|
commands = /bin/bash run_tests.sh -N --no-pep8 {posargs}
|
||||||
|
|
||||||
[testenv:py27]
|
[testenv:py27]
|
||||||
setenv = DJANGO_SETTINGS_MODULE=sahara_dashboard.test.settings
|
setenv =
|
||||||
|
{[testenv]setenv}
|
||||||
|
DJANGO_SETTINGS_MODULE=sahara_dashboard.test.settings
|
||||||
|
|
||||||
[testenv:py34]
|
[testenv:py34]
|
||||||
setenv = DJANGO_SETTINGS_MODULE=sahara_dashboard.test.settings
|
setenv =
|
||||||
|
{[testenv]setenv}
|
||||||
|
DJANGO_SETTINGS_MODULE=sahara_dashboard.test.settings
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
commands = flake8
|
commands = flake8
|
||||||
|
Loading…
Reference in New Issue
Block a user