Make tests more deterministic (hopefully).
Waiting until settled was not considering jobs in the jenkins queue.
This corrects that, as well as adding a little more debugging info
for the problematic job that was tickling this.
Change-Id: I1f4c76ff3e4adc830f47156d0740384815d5a51b
Reviewed-on: https://review.openstack.org/14106
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py
index 12f2ea2..d59a66a 100644
--- a/tests/test_scheduler.py
+++ b/tests/test_scheduler.py
@@ -493,7 +493,7 @@
len(self.all_jobs)))
def fakeAllWaiting(self, regex=None):
- all_jobs = self.all_jobs[:]
+ all_jobs = self.all_jobs[:] + self.queue[:]
for job in all_jobs:
self.log.debug("job %s %s" % (job.parameters['UUID'],
job.isWaiting()))
@@ -1481,6 +1481,8 @@
self.fake_jenkins.fakeRelease('.*-merge')
self.waitUntilSettled()
+ for x in jobs:
+ print x
# all jobs running
jobs[0].release()
jobs[1].release()