]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Tox: Remove fullstack env, keep only dsvm-fullstack
authorAssaf Muller <amuller@redhat.com>
Sat, 5 Dec 2015 22:17:13 +0000 (17:17 -0500)
committerAssaf Muller <amuller@redhat.com>
Sat, 5 Dec 2015 22:17:13 +0000 (17:17 -0500)
In the functional tests we have 'functional' and 'dsvm-functional'
venvs. The difference is that dsvm-functional requires can run
rootwrap commands on the machine. In the fullstack context,
not running rootwrap commands doesn't make sense, as fullstack
tests are explicitly and solely integration tests.

Change-Id: I1e85537d137a1b773198facbb835a65b6d0ce9b4

tox.ini

diff --git a/tox.ini b/tox.ini
index a13bdad6d01ddeb9526d9f2e8b543e8543a83c6c..befc62f9736bb8b8688299d1cd34e1f946a5bb9a 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -74,17 +74,11 @@ sitepackages={[testenv:dsvm-functional]sitepackages}
 deps =
   {[testenv:dsvm-functional]deps}
 
-[testenv:fullstack]
+[testenv:dsvm-fullstack]
 setenv = {[testenv]setenv}
          {[testenv:common]setenv}
-         OS_TEST_PATH=./neutron/tests/fullstack
-deps =
-  {[testenv]deps}
-  -r{toxinidir}/neutron/tests/functional/requirements.txt
-
-[testenv:dsvm-fullstack]
-setenv = {[testenv:fullstack]setenv}
          {[testenv:dsvm]setenv}
+         OS_TEST_PATH=./neutron/tests/fullstack
 sitepackages=True
 deps =
   {[testenv:functional]deps}