From 05bd907928f4e2c84a8ce006f7f994eed3f3adde Mon Sep 17 00:00:00 2001
From: Tobias Henkel <tobias.henkel@bmw.de>
Date: Mon, 8 Jun 2020 10:25:26 +0200
Subject: [PATCH] Fix test race in test_client_dequeue_ref

After dequeue we currently immediately release all jobs. This can lead
in seldom cases that the job is successful before the job has been
canceled by the scheduler. To fix this wait until settled between
dequeue and build release.

Change-Id: Ic788daa209a1ef7efdd58185935a5ebff2e5fb39
---
 tests/unit/test_scheduler.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/unit/test_scheduler.py b/tests/unit/test_scheduler.py
index 7b5dec0821..b34a60c3e8 100644
--- a/tests/unit/test_scheduler.py
+++ b/tests/unit/test_scheduler.py
@@ -4354,6 +4354,7 @@ class TestScheduler(ZuulTestCase):
             project='org/project1',
             change=None,
             ref='master')
+        self.waitUntilSettled()
         self.executor_server.release('.*')
         self.waitUntilSettled()
         job_names = [x.name for x in self.history]