From dd5a8e41669b965f8c1244c67a54f81e11efe3c2 Mon Sep 17 00:00:00 2001
From: Assaf Muller <amuller@redhat.com>
Date: Sat, 5 Dec 2015 17:17:13 -0500
Subject: [PATCH] Tox: Remove fullstack env, keep only dsvm-fullstack

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 | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/tox.ini b/tox.ini
index a13bdad6d01..befc62f9736 100644
--- 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}