Extend test timeout to 120s
This may help tests pass when running under 4 vcpus. Also: A following change adds more git operations to most of the tests. This is because each git repo must be listed in the tenant config file, and many tests share a tenant config with quite a number of repos which they don't use. We should improve the tests so that they don't operate on repos that they don't need, but that will take some work. Change-Id: I91a327968359b3650fbe0477e99dc274a1fb6266
This commit is contained in:
parent
93db6a8c75
commit
267e516cf4
|
@ -1135,7 +1135,7 @@ class MySQLSchemaFixture(fixtures.Fixture):
|
|||
|
||||
class BaseTestCase(testtools.TestCase):
|
||||
log = logging.getLogger("zuul.test")
|
||||
wait_timeout = 20
|
||||
wait_timeout = 30
|
||||
|
||||
def attachLogs(self, *args):
|
||||
def reader():
|
||||
|
|
|
@ -1368,7 +1368,7 @@ class TestScheduler(ZuulTestCase):
|
|||
def test_dependent_behind_dequeue(self):
|
||||
# This particular test does a large amount of merges and needs a little
|
||||
# more time to complete
|
||||
self.wait_timeout = 90
|
||||
self.wait_timeout = 120
|
||||
"test that dependent changes behind dequeued changes work"
|
||||
# This complicated test is a reproduction of a real life bug
|
||||
self.sched.reconfigure(self.config)
|
||||
|
|
2
tox.ini
2
tox.ini
|
@ -8,7 +8,7 @@ envlist = pep8, py27
|
|||
setenv = STATSD_HOST=127.0.0.1
|
||||
STATSD_PORT=8125
|
||||
VIRTUAL_ENV={envdir}
|
||||
OS_TEST_TIMEOUT=90
|
||||
OS_TEST_TIMEOUT=120
|
||||
passenv = ZUUL_TEST_ROOT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE OS_LOG_DEFAULTS
|
||||
usedevelop = True
|
||||
install_command = pip install {opts} {packages}
|
||||
|
|
Loading…
Reference in New Issue