From f08d66f81fd30db77d0a97a58d115e9237a11ace Mon Sep 17 00:00:00 2001
From: Tobias Henkel <tobias.henkel@bmw.de>
Date: Mon, 4 Feb 2019 08:04:20 +0100
Subject: [PATCH] Increase timeout for zuul to settle in tests

We're seeing a lot of occurrences where a test case failed with the
message 'Timeout waiting for zuul to settle' withoutany obvious
reason. After digging into one of these logs more deeply it gets
aborted just while doing regular git stuff during job
preparation. Thus it looks like the default timeout of 30 seconds is
just not enough on some slower nodes.

[1] Log snippet
2019-02-04 06:39:57,848 zuul.AnsibleJob                  DEBUG    [build: 19a6f8c3d35e49c29f89e83b8cb1204a] Create reference refs/heads/master at 1b86034fbdea80f4973c15b72ac85a676da0c315 in /tmp/tmpljq8cb9b
/zuul-test/19a6f8c3d35e49c29f89e83b8cb1204a/work/src/review.example.com/org/project
2019-02-04 06:39:57,859 git.cmd                          DEBUG    Popen(['git', 'cat-file', '--batch-check'], cwd=/tmp/tmpljq8cb9b/zuul-test/19a6f8c3d35e49c29f89e83b8cb1204a/work/src/review.example.com/org/
project, universal_newlines=False, shell=None)
2019-02-04 06:39:57,868 zuul.test                        ERROR    Timeout waiting for Zuul to settle
2019-02-04 06:39:57,869 zuul.test                        ERROR    Queue status:
2019-02-04 06:39:57,869 zuul.test                        ERROR      <queue.Queue object at 0x7fea0c2426d8>: True
2019-02-04 06:39:57,869 zuul.test                        ERROR      <queue.Queue object at 0x7fea0c242278>: True
2019-02-04 06:39:57,869 zuul.test                        ERROR      <zuul.lib.queue.MergedQueue object at 0x7fea0c242630>: True
2019-02-04 06:39:57,869 zuul.test                        ERROR      <queue.Queue object at 0x7fea0c095eb8>: True
2019-02-04 06:39:57,869 zuul.test                        DEBUG    <Build 19a6f8c3d35e49c29f89e83b8cb1204a of project-test1 voting:True on <Worker Unknown>> has not reported start
2019-02-04 06:39:57,869 zuul.test                        ERROR    All builds waiting: False
2019-02-04 06:39:57,870 zuul.test                        ERROR    All builds reported: True
2019-02-04 06:39:57,870 zuul.test                        ERROR    All requests completed: True
2019-02-04 06:39:57,870 zuul.test                        ERROR    Merge client jobs: set()

Change-Id: I48b0e452c894e0767625465daa749837bb1bd8fd
---
 tests/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/base.py b/tests/base.py
index a2f7c931b0..30766059bf 100644
--- a/tests/base.py
+++ b/tests/base.py
@@ -2187,7 +2187,7 @@ class PostgresqlSchemaFixture(fixtures.Fixture):
 
 class BaseTestCase(testtools.TestCase):
     log = logging.getLogger("zuul.test")
-    wait_timeout = 30
+    wait_timeout = 60
 
     def attachLogs(self, *args):
         def reader():