Merge "Use openstack.common.lockutils module for locks in tox functional tests."

diff --cc tox.ini
index da3ebf1b35f434f481c2b6efde4526242bd98731,d302de839db2533ee5c9829d87c803084ea16302..086001d1811b98f4451d6139c65906189889983d
--- 1/tox.ini
--- 2/tox.ini
+++ b/tox.ini
@@@ -15,24 -12,11 +15,24 @@@ deps = -r{toxinidir}/requirements.tx
  commands =
    python -m neutron.openstack.common.lockutils python setup.py testr --slowest --testr-args='{posargs}'
  
 +[testenv:hashtest]
 +# This is the same as default environment, but with a random PYTHONHASHSEED.
 +# You can also specify a specific hashseed (for test repeatability) as follows:
 +#   tox --hashseed 1235130571 -e hashtest
 +setenv = VIRTUAL_ENV={envdir}
 +
  [testenv:functional]
  setenv = OS_TEST_PATH=./neutron/tests/functional
 +commands =
 +  python setup.py testr --slowest --testr-args='{posargs}'
 +
 +[testenv:dsvm-functional]
 +setenv = OS_TEST_PATH=./neutron/tests/functional
 +         OS_SUDO_TESTING=1
 +         OS_ROOTWRAP_CMD=sudo /usr/local/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
 +         OS_FAIL_ON_MISSING_DEPS=1
  commands =
-   python setup.py testr --slowest --testr-args='{posargs}'
+   python -m neutron.openstack.common.lockutils python setup.py testr --slowest --testr-args='{posargs}'
  
  [tox:jenkins]
  sitepackages = True