zuul
/
zuul
Code Issues Proposed changes

Merge "Avoid race when task from queue is in progress"

This commit is contained in:
Zuul 2021-03-24 22:46:41 +00:00 committed by Gerrit Code Review
parent 9bbbe24100 0e9635fa51
commit d812b9fefc
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/base.py
View File

@ -4901,9 +4901,9 @@ class ZuulTestCase(BaseTestCase):
return False
return True
def __eventQueuesEmpty(self, matcher) -> Generator[bool, None, None]:
def __eventQueuesEmpty(self, matcher=None) -> Generator[bool, None, None]:
for event_queue in self.__event_queues(matcher):
yield event_queue.empty()
yield not event_queue.unfinished_tasks
def __eventQueuesJoin(self, matcher) -> None:
for app in self.scheds.filter(matcher):
@ -4988,7 +4988,8 @@ class ZuulTestCase(BaseTestCase):
all_event_queues_empty):
logger("Queue status:")
for event_queue in self.__event_queues(matcher):
self.log.debug(" %s: %s", event_queue, event_queue.empty())
is_empty = not event_queue.unfinished_tasks
self.log.debug(" %s: %s", event_queue, is_empty)
logger("All ZK event queues empty: %s", all_zk_queues_empty)
logger("All merge jobs waiting: %s", all_merge_jobs_waiting)
logger("All builds reported: %s", all_builds_reported)