diff options
| author | Zuul <zuul@review.opendev.org> | 2021-11-30 07:36:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-11-30 07:36:05 +0000 |
| commit | 317fff1080fb908ea49b6e384cc47860fe5fe387 (patch) | |
| tree | 6152aefe323044086db6f5a232591802583b3cfc /tests/unit/test_sos.py | |
| parent | 4110366314b2dad3e0379f80395feae75b16157c (diff) | |
| parent | 28289cb652532c8501678a90b8c32625c0e3581a (diff) | |
| download | zuul-317fff1080fb908ea49b6e384cc47860fe5fe387.tar.gz | |
Merge "Combine different history approaches for merge jobs in tests"
Diffstat (limited to 'tests/unit/test_sos.py')
| -rw-r--r-- | tests/unit/test_sos.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/unit/test_sos.py b/tests/unit/test_sos.py index 5fa53e856..cbdabc91f 100644 --- a/tests/unit/test_sos.py +++ b/tests/unit/test_sos.py @@ -77,8 +77,10 @@ class TestScaleOutScheduler(ZuulTestCase): second_app.sched.local_layout_state.get("tenant-one")) # Make sure only the first schedulers issued cat jobs - self.assertIsNotNone(first_app.sched.merger.history.get("cat")) - self.assertIsNone(second_app.sched.merger.history.get("cat")) + self.assertIsNotNone( + first_app.sched.merger.merger_api.history.get("cat")) + self.assertIsNone( + second_app.sched.merger.merger_api.history.get("cat")) for _ in iterate_timeout( 10, "Wait for all schedulers to have the same system config"): |