| commit | d4ce9309fea120ff918576b0a84cea7c58af8a14 | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Thu Dec 26 19:34:01 2013 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Thu Dec 26 19:34:01 2013 +0000 |
| tree | 2f4248f6a6e6a6c9b89e0b168e21bf5ef5061d10 | |
| parent | aea6cf6487977e24b1ed6ad93b0dda1d878f3c4f [diff] | |
| parent | d0e579a6ae9bdb193962084797dfd23c1c52165a [diff] |
Merge "Use timeout fixture (30 seconds) for tests"
diff --git a/tox.ini b/tox.ini index a92fdb2..df89498 100644 --- a/tox.ini +++ b/tox.ini
@@ -8,6 +8,7 @@ setenv = STATSD_HOST=localhost STATSD_PORT=8125 VIRTUAL_ENV={envdir} + OS_TEST_TIMEOUT=30 usedevelop = True install_command = pip install {opts} {packages} deps = -r{toxinidir}/requirements.txt