Updated consolidated tox.ini files and made them workable on windows.

Some extra environment variables are necessary on windows to get the CLI
to pass the integration tests when using 'tox'. Specifically, the HOME*
environment variables are needed to allow python's 'expanduser()'
function to succeed when resolving the '~' path for the default
DCOS_DIR. Additionally, the OPENSSL_CONF variable is need to allow SSL
connections to be made properly using the windows OpenSSL library.
Without these additional variables things seem to die in unexpected
ways.
This commit is contained in:
Kevin Klues 2017-06-28 21:26:49 -07:00
parent f51e3a614a
commit 9bed83ac76
3 changed files with 18 additions and 29 deletions

View File

@ -15,7 +15,16 @@ deps =
teamcity-messages
-e..
# We currently include '*' as a catch all even though we also whitelist
# specific # environment variables we know we care about. We should audit this in
# the near future.
passenv =
*
HOME
USERPROFILE
HOMEPATH
HOMEDRIVE
OPENSSL_CONF
DCOS_*
CI_FLAGS
CLI_TEST_SSH_KEY_PATH

View File

@ -13,7 +13,16 @@ deps =
pytest-cov
teamcity-messages
# We currently include '*' as a catch all even though we also whitelist
# specific # environment variables we know we care about. We should audit this in
# the near future.
passenv =
*
HOME
USERPROFILE
HOMEPATH
HOMEDRIVE
OPENSSL_CONF
DCOS_*
CI_FLAGS
CLI_TEST_SSH_KEY_PATH

View File

@ -1,29 +0,0 @@
[tox]
envlist = py35-unit
toxworkdir={env:TOXWORKDIR:.tox}
[testenv]
setenv =
DCOS_CONFIG = {env:DCOS_CONFIG}
passenv =
TEAMCITY_VERSION
deps =
pytest
pytest-cov
pypiwin32
teamcity-messages
[testenv:syntax]
deps =
flake8
flake8-import-order==0.9.2
pep8-naming
commands =
flake8 --verbose {env:CI_FLAGS:} dcos tests setup.py
[testenv:py35-unit]
commands =
py.test -vv {env:CI_FLAGS:} --cov {envsitepackagesdir}/dcos tests