Re-enable test_dependent_behind_dequeue
This test was already refactored for v3, but it was causing occasional
timeouts. This is a very merge-heavy test, and as such, sometimes runs
out of time when contending for resources. So we'll bump the overall
hard-timeout by 30 seconds which should prevent us from timing out at
that level, and also raise the soft wait timeout to 90 seconds for just
this test.
Change-Id: I74e54d8a7d9b813772c498ccb87fb6644b533842
diff --git a/tox.ini b/tox.ini
index b7d89d1..9c0d949 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@
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}