Increase individual test timeout

test_dependent_behind_dequeue is running right at 30 seconds now
(slowed by the addition of nodepool and ansible/git tasks to all
tests).  Increase the timeout to compensate.

Also increase the settle timeout.  Because of the same additions,
some complex jobs take more than 10 seconds to stabilize now.

Change-Id: I7500b55cbe9e349b826760f31168c14087cf236f

tests/base.py

@@ -1559,7 +1559,7 @@ class ZuulTestCase(BaseTestCase):
         self.log.debug("Waiting until settled...")
         start = time.time()
         while True:
-            if time.time() - start > 10:
+            if time.time() - start > 20:
                 self.log.error("Timeout waiting for Zuul to settle")
                 self.log.error("Queue status:")
                 for queue in self.event_queues:

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=30
+         OS_TEST_TIMEOUT=60
          OS_LOG_DEFAULTS={env:OS_LOG_DEFAULTS:gear=WARNING}
 passenv = ZUUL_TEST_ROOT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE
 usedevelop = True