diff options
| -rwxr-xr-x | tests/base.py | 3 | ||||
| -rwxr-xr-x | tests/unit/test_scheduler.py | 4 | ||||
| -rw-r--r-- | tox.ini | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/tests/base.py b/tests/base.py index 452562776..52c073f94 100755 --- a/tests/base.py +++ b/tests/base.py @@ -1069,6 +1069,7 @@ class ChrootedKazooFixture(fixtures.Fixture): class BaseTestCase(testtools.TestCase): log = logging.getLogger("zuul.test") + wait_timeout = 20 def attachLogs(self, *args): def reader(): @@ -1611,7 +1612,7 @@ class ZuulTestCase(BaseTestCase): self.log.debug("Waiting until settled...") start = time.time() while True: - if time.time() - start > 20: + if time.time() - start > self.wait_timeout: self.log.error("Timeout waiting for Zuul to settle") self.log.error("Queue status:") for queue in self.event_queues: diff --git a/tests/unit/test_scheduler.py b/tests/unit/test_scheduler.py index c787f7386..45b2257b7 100755 --- a/tests/unit/test_scheduler.py +++ b/tests/unit/test_scheduler.py @@ -1273,8 +1273,10 @@ class TestScheduler(ZuulTestCase): self.assertEqual(self.getJobFromHistory('project-test2').result, 'FAILURE') - @skip("This test generally works but times out frequently") 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 "test that dependent changes behind dequeued changes work" # This complicated test is a reproduction of a real life bug self.sched.reconfigure(self.config) @@ -8,7 +8,7 @@ envlist = pep8, py27 setenv = STATSD_HOST=127.0.0.1 STATSD_PORT=8125 VIRTUAL_ENV={envdir} - OS_TEST_TIMEOUT=60 + OS_TEST_TIMEOUT=90 passenv = ZUUL_TEST_ROOT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE OS_LOG_DEFAULTS usedevelop = True install_command = pip install {opts} {packages} |