Fix neutron tests

Tox updated to a new major version and changed some substitute
variables.

Change-Id: Ifd00abed7bf0a68d4d46d12230118022fa2292ef
Related-Bug: #1455102
(cherry picked from commit 0933f26b2c9772c457bb259cff7c8f648d29f620)

diff --git a/tox.ini b/tox.ini
index 6a9cc8ffb8f8540fb3c53a7346da36e34a182bf0..12fb5496603f59a79639d69c7f6e9eb5125662d1 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,7 @@ deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 whitelist_externals = sh
 commands =
-  dsvm-functional: {toxinidir}/tools/deploy_rootwrap.sh {toxinidir} {envdir}/etc {envbindir}
+  dsvm-functional: {toxinidir}/tools/deploy_rootwrap.sh {toxinidir} {envdir}/etc {envdir}/bin
   sh tools/pretty_tox.sh '{posargs}'
 # there is also secret magic in pretty_tox.sh which lets you run in a fail only
 # mode. To do this define the TRACE_FAILONLY environmental variable.
@@ -40,8 +40,8 @@ deps =
 [testenv:dsvm-functional]
 setenv = OS_TEST_PATH=./neutron/tests/functional
          OS_SUDO_TESTING=1
-         OS_ROOTWRAP_CMD=sudo {envbindir}/neutron-rootwrap {envdir}/etc/neutron/rootwrap.conf
-         OS_ROOTWRAP_DAEMON_CMD=sudo {envbindir}/neutron-rootwrap-daemon {envdir}/etc/neutron/rootwrap.conf
+         OS_ROOTWRAP_CMD=sudo {envdir}/bin/neutron-rootwrap {envdir}/etc/neutron/rootwrap.conf
+         OS_ROOTWRAP_DAEMON_CMD=sudo {envdir}/bin/neutron-rootwrap-daemon {envdir}/etc/neutron/rootwrap.conf
          OS_FAIL_ON_MISSING_DEPS=1
          OS_TEST_TIMEOUT=180
 sitepackages=True
@@ -58,8 +58,8 @@ deps =
 [testenv:dsvm-fullstack]
 setenv = OS_TEST_PATH=./neutron/tests/fullstack
          OS_SUDO_TESTING=1
-         OS_ROOTWRAP_CMD=sudo {envbindir}/neutron-rootwrap {envdir}/etc/neutron/rootwrap.conf
-         OS_ROOTWRAP_DAEMON_CMD=sudo {envbindir}/neutron-rootwrap-daemon {envdir}/etc/neutron/rootwrap.conf
+         OS_ROOTWRAP_CMD=sudo {envdir}/bin/neutron-rootwrap {envdir}/etc/neutron/rootwrap.conf
+         OS_ROOTWRAP_DAEMON_CMD=sudo {envdir}/bin/neutron-rootwrap-daemon {envdir}/etc/neutron/rootwrap.conf
          OS_FAIL_ON_MISSING_DEPS=1
          OS_TEST_TIMEOUT=180
 sitepackages=True