diff --git a/.gitignore b/.gitignore index 37230f8..e454cf6 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,6 @@ eggs etc/sahara.conf etc/sahara/*.conf etc/sahara/*.topology -sahara/tests/integration/configs/itest.conf sdist target tools/lintstack.head.py diff --git a/tox.ini b/tox.ini index b14641e..3e64a3a 100644 --- a/tox.ini +++ b/tox.ini @@ -16,12 +16,6 @@ commands = bash tools/pretty_tox.sh '{posargs}' whitelist_externals = bash passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY -[testenv:integration] -setenv = - VIRTUAL_ENV={envdir} - DISCOVER_DIRECTORY=sahara/tests/integration -commands = bash tools/pretty_tox.sh '{posargs}' - [testenv:scenario] setenv = VIRTUALENV={envdir} commands = python {toxinidir}/sahara/tests/scenario/runner.py {posargs}