Skip tests asserting on tenant reconfig results on multi scheduler

Those tests are failing with multiple schedulers depending on which
scheduler completed the tenant reconfiguration first. As all assertions
are done on the objects from scheduler-0, they will fail if scheduler-1
completed the tenant reconfiguration first.

To make those tests work with multiple schedulers, we might want to wait
until all schedulers completed their reconfigs before doing the
assertions.

There are also a few test cases that don't rely directly on the results
of a tenant reconfiguration, but still use local tenant objects for
assertions. I assume that those tests are failing for the same reason -
because the tenant object used for the assertion is not up-to-date.

Change-Id: I4df816ec98f5fbab25cd412a5146f0f85d6d0138

1 files changed, 3 insertions, 0 deletions

diff --git a/tests/unit/test_gerrit_crd.py b/tests/unit/test_gerrit_crd.py
index e42bafef5..480d96e60 100644
--- a/tests/unit/test_gerrit_crd.py
+++ b/tests/unit/test_gerrit_crd.py
@@ -16,6 +16,7 @@
 from tests.base import (
     ZuulTestCase,
     simple_layout,
+    skipIfMultiScheduler,
 )
 
 URL_FORMATS = [
@@ -542,9 +543,11 @@ class TestGerritCRD(ZuulTestCase):
         self.assertEqual(self.history[0].changes, '2,1 1,1')
         self.assertEqual(len(tenant.layout.pipelines['check'].queues), 0)
 
+    @skipIfMultiScheduler()
     def test_crd_check_reconfiguration(self):
         self._test_crd_check_reconfiguration('org/project1', 'org/project2')
 
+    @skipIfMultiScheduler()
     def test_crd_undefined_project(self):
         """Test that undefined projects in dependencies are handled for
         independent pipelines"""