From 8038f9f75cafe2a1bf5e4c9faf7544427deb7084 Mon Sep 17 00:00:00 2001 From: Felix Edel Date: Wed, 21 Jul 2021 14:23:43 +0200 Subject: Execute merge jobs via ZooKeeper This is the second part of I767c0b4c5473b2948487c3ae5bbc612c25a2a24a. It uses the MergerAPI. Note: since we no longer have a central gearman server where we can record all of the merge jobs, some tests now consult the merger api to get the list of merge jobs which were submitted by that scheduler. This should generally be equivalent, but something to keep in mind as we add multiple schedulers. Change-Id: I1c694bcdc967283f1b1a4821df7700d93240690a --- tests/unit/test_sos.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/unit/test_sos.py') diff --git a/tests/unit/test_sos.py b/tests/unit/test_sos.py index 298509bff..bf88be3c3 100644 --- a/tests/unit/test_sos.py +++ b/tests/unit/test_sos.py @@ -58,10 +58,10 @@ class TestScaleOutScheduler(ZuulTestCase): for app in self.scheds.instances: if app is self.scheds.first: self.assertIsNotNone( - app.sched.merger.history.get("merger:cat")) + app.sched.merger.history.get("cat")) else: # Make sure the other schedulers did not issue any cat jobs - self.assertIsNone(app.sched.merger.history.get("merger:cat")) + self.assertIsNone(app.sched.merger.history.get("cat")) self.waitUntilSettled() self.assertEqual(self.scheds.first.sched.globals.max_hold_expiration, -- cgit v1.2.1