diff options
author | Sean Dague <sean.dague@samsung.com> | 2014-02-20 18:50:41 -0500 |
---|---|---|
committer | Sean Dague <sean.dague@samsung.com> | 2014-02-27 06:34:03 -0500 |
commit | a646d179ae74ba347278d22e05132618b2494f67 (patch) | |
tree | 7d4358ae9b6017ecd0e9c54225f7e4ccf2286848 /tox.ini | |
parent | 3db3f0742e9bbff615a477e21ae8ca82d0f77505 (diff) | |
download | tempest-a646d179ae74ba347278d22e05132618b2494f67.tar.gz |
Revert "always use sitepackages"
This reverts commit c81568fa85620746534331cd820b0bb399719149.
After learning what I learned about how sitepackages works, this
wasn't really a sane change. Revert back to old behavior.
Change-Id: I8079a0f4d9e0bc2e51a743d4f23cf98d4840a3ab
Diffstat (limited to 'tox.ini')
-rw-r--r-- | tox.ini | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -4,11 +4,10 @@ minversion = 1.6 skipsdist = True [testenv] -sitepackages = True setenv = VIRTUAL_ENV={envdir} OS_TEST_PATH=./tempest/test_discover usedevelop = True -install_command = pip install {opts} {packages} +install_command = pip install -U {opts} {packages} [testenv:py26] setenv = OS_TEST_PATH=./tempest/tests @@ -27,11 +26,13 @@ setenv = OS_TEST_PATH=./tempest/tests commands = python setup.py testr --coverage --testr-arg='tempest\.tests {posargs}' [testenv:all] +sitepackages = True setenv = VIRTUAL_ENV={envdir} commands = python setup.py testr --slowest --testr-args='{posargs}' [testenv:full] +sitepackages = True # The regex below is used to select which tests to run and exclude the slow tag: # See the testrepostiory bug: https://bugs.launchpad.net/testrepository/+bug/1208610 commands = @@ -44,24 +45,29 @@ commands = bash tools/pretty_tox_serial.sh '(?!.*\[.*\bslow\b.*\])(^tempest\.(api|scenario|thirdparty|cli)) {posargs}' [testenv:testr-full] +sitepackages = True commands = bash tools/pretty_tox.sh '(?!.*\[.*\bslow\b.*\])(^tempest\.(api|scenario|thirdparty|cli)) {posargs}' [testenv:heat-slow] +sitepackages = True setenv = OS_TEST_TIMEOUT=1200 # The regex below is used to select heat api/scenario tests tagged as slow. commands = bash tools/pretty_tox_serial.sh '(?=.*\[.*\bslow\b.*\])(^tempest\.(api|scenario)\.orchestration) {posargs}' [testenv:large-ops] +sitepackages = True commands = python setup.py testr --slowest --testr-args='tempest.scenario.test_large_ops {posargs}' [testenv:smoke] +sitepackages = True commands = bash tools/pretty_tox.sh '(?!.*\[.*\bslow\b.*\])((smoke)|(^tempest\.scenario)) {posargs}' [testenv:smoke-serial] +sitepackages = True # This is still serial because neutron doesn't work with parallel. See: # https://bugs.launchpad.net/tempest/+bug/1216076 so the neutron smoke # job would fail if we moved it to parallel. @@ -69,6 +75,7 @@ commands = bash tools/pretty_tox_serial.sh '(?!.*\[.*\bslow\b.*\])((smoke)|(^tempest\.scenario)) {posargs}' [testenv:stress] +sitepackages = True commands = python -m tempest/stress/run_stress -a -d 3600 -S |