Enable test_new_patchset_check / test_abandoned_check
Update tests twith new zuulv3 syntax for tenants.
Change-Id: Icaca7c7a894e8b8f69705a1381d5ceb846e892c1
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py
index fe524a4..c98fe29 100755
--- a/tests/test_scheduler.py
+++ b/tests/test_scheduler.py
@@ -1681,7 +1681,6 @@
self.assertEqual(D.reported, 2)
self.assertEqual(len(self.history), 9) # 3 each for A, B, D.
- @skip("Disabled for early v3 development")
def test_new_patchset_check(self):
"Test a new patchset in check"
@@ -1689,7 +1688,8 @@
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
- check_pipeline = self.sched.layout.pipelines['check']
+ tenant = self.sched.abide.tenants.get('tenant-one')
+ check_pipeline = tenant.layout.pipelines['check']
# Add two git-dependent changes
B.setDependsOn(A, 1)
@@ -1802,7 +1802,6 @@
self.assertEqual(A.reported, 1,
"Abandoned gate change should report only start")
- @skip("Disabled for early v3 development")
def test_abandoned_check(self):
"Test that an abandoned change is dequeued from check"
@@ -1810,7 +1809,8 @@
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
- check_pipeline = self.sched.layout.pipelines['check']
+ tenant = self.sched.abide.tenants.get('tenant-one')
+ check_pipeline = tenant.layout.pipelines['check']
# Add two git-dependent changes
B.setDependsOn(A, 1)