Merge "Ensure tests run under python2.7"

diff --cc tox.ini
index 0f7ec5e809660dbd0f56195df0e32d65a9dd5fee,e09a40422601971359415c91ec54456e93bb98f5..45f8968fd4876efa2c3a59104f98501227c75722
--- 1/tox.ini
--- 2/tox.ini
+++ b/tox.ini
@@@ -12,48 -14,36 +12,51 @@@ deps = -r{toxinidir}/requirements.tx
         -r{toxinidir}/test-requirements.txt
  whitelist_externals = sh
  commands =
 -  dsvm-functional: {toxinidir}/tools/deploy_rootwrap.sh {toxinidir} {envdir}/etc {envbindir}
 -  sh tools/pretty_tox.sh '{posargs}'
 -# there is also secret magic in pretty_tox.sh which lets you run in a fail only
 +  dsvm-functional: {toxinidir}/tools/deploy_rootwrap.sh {toxinidir} {envdir}/etc {envdir}/bin
 +  ostestr --regex '{posargs}'
 +# there is also secret magic in ostestr which lets you run in a fail only
  # mode. To do this define the TRACE_FAILONLY environmental variable.
  
 -[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:api]
+ basepython = python2.7
  setenv = OS_TEST_PATH=./neutron/tests/api
 +         TEMPEST_CONFIG_DIR={env:TEMPEST_CONFIG_DIR:/opt/stack/tempest/etc}
 +         OS_TEST_API_WITH_REST=1
  
  [testenv:functional]
+ basepython = python2.7
  setenv = OS_TEST_PATH=./neutron/tests/functional
 -         OS_TEST_TIMEOUT=90
 +         OS_TEST_TIMEOUT=180
  deps =
    {[testenv]deps}
    -r{toxinidir}/neutron/tests/functional/requirements.txt
  
  [testenv:dsvm-functional]
+ basepython = python2.7
  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_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
 +deps =
 +  {[testenv:functional]deps}
 +
 +[testenv:fullstack]
 +setenv = OS_TEST_PATH=./neutron/tests/fullstack
 +         OS_TEST_TIMEOUT=180
 +deps =
 +  {[testenv]deps}
 +  -r{toxinidir}/neutron/tests/functional/requirements.txt
 +
 +[testenv:dsvm-fullstack]
 +setenv = OS_TEST_PATH=./neutron/tests/fullstack
 +         OS_SUDO_TESTING=1
 +         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=90
 +         OS_TEST_TIMEOUT=180
  sitepackages=True
  deps =
    {[testenv:functional]deps}
@@@ -69,16 -60,13 +73,17 @@@ deps 
  commands=
    # If it is easier to add a check via a shell script, consider adding it in this file
    sh ./tools/misc-sanity-checks.sh
 +  {toxinidir}/tools/check_unit_test_structure.sh
 +  # Checks for coding and style guidelines
    flake8
 -  neutron-db-manage check_migration
 -  pylint --rcfile=.pylintrc --output-format=colorized {posargs:neutron}
 -whitelist_externals = sh
 +  sh ./tools/coding-checks.sh --pylint '{posargs}'
 +  neutron-db-manage --config-file neutron/tests/etc/neutron.conf check_migration
 +whitelist_externals =
 +  sh
 +  bash
  
  [testenv:cover]
+ basepython = python2.7
  commands =
    python setup.py testr --coverage --testr-args='{posargs}'