Merge "Improve test output" into feature/zuulv3
diff --git a/tests/base.py b/tests/base.py
index b84bcf9..a1c247e 100755
--- a/tests/base.py
+++ b/tests/base.py
@@ -1517,13 +1517,18 @@
start = time.time()
while True:
if time.time() - start > 10:
- self.log.debug("Queue status:")
+ self.log.error("Timeout waiting for Zuul to settle")
+ self.log.error("Queue status:")
for queue in self.event_queues:
- self.log.debug(" %s: %s" % (queue, queue.empty()))
- self.log.debug("All builds waiting: %s" %
+ self.log.error(" %s: %s" % (queue, queue.empty()))
+ self.log.error("All builds waiting: %s" %
(self.areAllBuildsWaiting(),))
- self.log.debug("All builds reported: %s" %
+ self.log.error("All builds reported: %s" %
(self.haveAllBuildsReported(),))
+ self.log.error("All requests completed: %s" %
+ (self.areAllNodeRequestsComplete(),))
+ self.log.error("Merge client jobs: %s" %
+ (self.merge_client.jobs,))
raise Exception("Timeout waiting for Zuul to settle")
# Make sure no new events show up while we're checking
diff --git a/tox.ini b/tox.ini
index 1f6b39e..9c2daee 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,7 +9,7 @@
STATSD_PORT=8125
VIRTUAL_ENV={envdir}
OS_TEST_TIMEOUT=30
- OS_LOG_DEFAULTS={env:OS_LOG_DEFAULTS:gear.Server=INFO,gear.Client=INFO}
+ OS_LOG_DEFAULTS={env:OS_LOG_DEFAULTS:gear=WARNING}
passenv = ZUUL_TEST_ROOT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE
usedevelop = True
install_command = pip install {opts} {packages}