zuul
/
zuul
Code Issues Proposed changes

Merge "Enable test_new_patchset_check / test_abandoned_check" into feature/zuulv3

This commit is contained in:
Jenkins 2016-11-09 20:14:25 +00:00 committed by Gerrit Code Review
parent a46a3744a3 18e5f63e1b
commit e0add97e6d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/test_scheduler.py
View File

@ -1681,7 +1681,6 @@ jobs:
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 @@ jobs:
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 @@ jobs:
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 @@ jobs:
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)