diff options
-rw-r--r-- | pbr/tests/test_integration.py | 2 | ||||
-rw-r--r-- | tools/integration.sh | 2 |
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 |