| commit | 7cbc5a42f2e035c17cf113ab92cc5aaf9f3c4a40 | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Fri Nov 07 17:04:14 2014 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Fri Nov 07 17:04:14 2014 +0000 |
| tree | d2b7b4d2fdea3bedbcef7784d2b7f72ef8ecbe59 | |
| parent | ff31bccce8f166d43e351e85a2e13d8d52779772 [diff] | |
| parent | f9695d21b35accb1451958073db23e9d5553b731 [diff] |
Merge "Increase the 'all' timeout because slow tests are included"
diff --git a/tox.ini b/tox.ini index e575b4f..9f52f0d 100644 --- a/tox.ini +++ b/tox.ini
@@ -28,7 +28,9 @@ [testenv:all] sitepackages = {[tempestenv]sitepackages} +# 'all' includes slow tests setenv = {[tempestenv]setenv} + OS_TEST_TIMEOUT=1200 deps = {[tempestenv]deps} commands = bash tools/pretty_tox.sh '{posargs}'