commit d88f8a4c695613c7e74e3ab786e8f71d2702609f
author Jenkins <jenkins@review.openstack.org> Tue Sep 03 20:00:39 2013 +0000
committer Gerrit Code Review <review@openstack.org> Tue Sep 03 20:00:39 2013 +0000
tree 012ef7f78f496d75e84620f1fd0ddced79977edb
parent 25a8d6cb5ceae8f519cda4b74b694f0628e030d5
parent 53f887f40da57274b1ea9590adb696f017f26b4f

Merge "Increase default test timeout for timeout fixture"

.testr.conf

diff --git a/.testr.conf b/.testr.conf
index 510f4c9..05b12c4 100644
--- a/.testr.conf
+++ b/.testr.conf
@@ -1,7 +1,7 @@
 [DEFAULT]
 test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
              OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
-             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-250} \
+             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-500} \
              ${PYTHON:-python} -m subunit.run discover -t ./ ./tempest $LISTOPT $IDOPTION
 test_id_option=--load-list $IDFILE
 test_list_option=--list