summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Collins <rbtcollins@hp.com>2015-05-14 19:35:50 +1200
committerRobert Collins <rbtcollins@hp.com>2015-05-14 19:35:50 +1200
commit0f4caa10579c7a29b2420c20309f1184c20640ff (patch)
treeb0bd1c09c3cbf83d15e4f3ae2c00657b1f692057
parentd28f40db396b02e78936092147adf264ab58242a (diff)
downloadpbr-0f4caa10579c7a29b2420c20309f1184c20640ff.tar.gz
Bump integration test timeouts.
Node load is too variable. Change-Id: If03cd577ea18bfad4b53fcddb7a87e48eefe84c1
-rw-r--r--pbr/tests/test_integration.py2
-rw-r--r--tools/integration.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/pbr/tests/test_integration.py b/pbr/tests/test_integration.py
index dcc71df..30cc5a2 100644
--- a/pbr/tests/test_integration.py
+++ b/pbr/tests/test_integration.py
@@ -101,7 +101,7 @@ class TestIntegration(base.BaseTestCase):
def setUp(self):
# Integration tests need a higher default - big repos can be slow to
# clone, particularly under guest load.
- os.environ['OS_TEST_TIMEOUT'] = os.environ.get('OS_TEST_TIMEOUT', 240)
+ os.environ['OS_TEST_TIMEOUT'] = os.environ.get('OS_TEST_TIMEOUT', 600)
super(TestIntegration, self).setUp()
base._config_git()
diff --git a/tools/integration.sh b/tools/integration.sh
index e58267e..ed15fab 100644
--- a/tools/integration.sh
+++ b/tools/integration.sh
@@ -161,6 +161,6 @@ export PBRVERSION
export PROJECTS
export REPODIR
export WHEELHOUSE
-export OS_TEST_TIMEOUT=240
+export OS_TEST_TIMEOUT=600
cd $REPODIR/pbr
tox -epy27 -- test_integration