zuul
/
zuul
Code Issues Proposed changes

Fix ordering of parameters in _logQueueStatus() call 

The parameters to _logQueueStatus() are provided in the wrong order.
This put me on a completely wrong track when debugging a test case in
Zuul that didn't settle in time as the queue status mentioned "All
builds waiting" to be the culprit and not "All requests completed".

The output of _logQueueStatus() was:

    All ZK event queues empty: True
    All merge jobs waiting: True
    All builds reported: True
    All builds waiting: False
    All requests completed: True
    All event queues empty: True

while it should have been:

    All ZK event queues empty: True
    All merge jobs waiting: True
    All builds reported: True
    All builds waiting: True
    All requests completed: False
    All event queues empty: True

Change-Id: I161b8bf2aee208033730a4e29606887a60eb5768
This commit is contained in:
Felix Edel 2021-08-13 08:28:53 +02:00
parent 7be3e929b0
commit de32aecb4a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/base.py
View File

@ -5260,11 +5260,11 @@ class ZuulTestCase(BaseTestCase):
self.log.error("Timeout waiting for Zuul to settle")
self._logQueueStatus(
self.log.error, matcher,
self.__areZooKeeperEventQueuesEmpty(matcher),
self.__areAllMergeJobsWaiting(matcher),
self.__haveAllBuildsReported(matcher),
self.__areAllBuildsWaiting(matcher),
self.__areAllNodeRequestsComplete(matcher),
self.__areZooKeeperEventQueuesEmpty(matcher),
all(self.__eventQueuesEmpty(matcher))
)
raise Exception("Timeout waiting for Zuul to settle")