Merge "Re-enable test_queue_precedence test" into feature/zuulv3
diff --git a/tests/base.py b/tests/base.py
index 6092626..073b8ad 100755
--- a/tests/base.py
+++ b/tests/base.py
@@ -772,7 +772,7 @@
for queue in [self.high_queue, self.normal_queue, self.low_queue]:
for job in queue:
if not hasattr(job, 'waiting'):
- if job.name.startswith('build:'):
+ if job.name.startswith('launcher:launch'):
job.waiting = self.hold_jobs_in_queue
else:
job.waiting = False
@@ -799,10 +799,10 @@
len(self.low_queue))
self.log.debug("releasing queued job %s (%s)" % (regex, qlen))
for job in self.getQueue():
- cmd, name = job.name.split(':')
- if cmd != 'build':
+ if job.name != 'launcher:launch':
continue
- if not regex or re.match(regex, name):
+ parameters = json.loads(job.arguments)
+ if not regex or re.match(regex, parameters.get('job')):
self.log.debug("releasing queued job %s" %
job.unique)
job.waiting = False
diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py
index b0c1f50..dc479ab 100755
--- a/tests/test_scheduler.py
+++ b/tests/test_scheduler.py
@@ -2284,7 +2284,6 @@
Exception, "More than one name assigned to change queue"):
self.sched.reconfigure(self.config)
- @skip("Disabled for early v3 development")
def test_queue_precedence(self):
"Test that queue precedence works"