Re-enable requirement-older-than tests
Re-enable the requirement-older-than tests that ensure a specific user has had
an approve for a certain amount of time.
Change-Id: Id733f824311bbc752251d0f6406f49917c23bc13
diff --git a/tests/test_requirements.py b/tests/test_requirements.py
index a73493f..d503451 100644
--- a/tests/test_requirements.py
+++ b/tests/test_requirements.py
@@ -65,51 +65,50 @@
self.assertEqual(self.history[0].name, job)
-class TestRequirements(ZuulTestCase):
- """Test pipeline and trigger requirements"""
+class TestRequirementsApprovalOlderThan(ZuulTestCase):
+ """Requirements with a older-than comment requirement"""
- tenant_config_file = 'config/requirements/main.yaml'
+ tenant_config_file = 'config/requirements/older-than/main.yaml'
- @skip("Disabled for early v3 development")
def test_pipeline_require_approval_older_than(self):
"Test pipeline requirement: approval older than"
return self._test_require_approval_older_than('org/project1',
- 'project1-pipeline')
+ 'project1-job')
- @skip("Disabled for early v3 development")
def test_trigger_require_approval_older_than(self):
"Test trigger requirement: approval older than"
return self._test_require_approval_older_than('org/project2',
- 'project2-trigger')
+ 'project2-job')
def _test_require_approval_older_than(self, project, job):
- self.updateConfigLayout(
- 'tests/fixtures/layout-requirement-older-than.yaml')
- self.sched.reconfigure(self.config)
- self.registerJobs()
-
A = self.fake_gerrit.addFakeChange(project, 'master', 'A')
# A comment event that we will keep submitting to trigger
- comment = A.addApproval('CRVW', 2, username='nobody')
+ comment = A.addApproval('code-review', 2, username='nobody')
self.fake_gerrit.addEvent(comment)
self.waitUntilSettled()
# No +1 from Jenkins so should not be enqueued
self.assertEqual(len(self.history), 0)
# Add a recent +1 which should not be enqueued
- A.addApproval('VRFY', 1)
+ A.addApproval('verified', 1)
self.fake_gerrit.addEvent(comment)
self.waitUntilSettled()
self.assertEqual(len(self.history), 0)
# Add an old +1 which should be enqueued
- A.addApproval('VRFY', 1, username='jenkins',
+ A.addApproval('verified', 1, username='jenkins',
granted_on=time.time() - 72 * 60 * 60)
self.fake_gerrit.addEvent(comment)
self.waitUntilSettled()
self.assertEqual(len(self.history), 1)
self.assertEqual(self.history[0].name, job)
+
+class TestRequirements(ZuulTestCase):
+ """Test pipeline and trigger requirements"""
+
+ tenant_config_file = 'config/requirements/main.yaml'
+
@skip("Disabled for early v3 development")
def test_pipeline_require_approval_username(self):
"Test pipeline requirement: approval username"