diff --git a/tests/base.py b/tests/base.py index fbbe717994..770c636091 100755 --- a/tests/base.py +++ b/tests/base.py @@ -137,16 +137,6 @@ class FakeGerritChange(object): 'Code-Review': ('Code-Review', -2, 2), 'Verified': ('Verified', -2, 2)} - # TODO(tobiash): This is used as a translation layer between the tests - # which use lower case labels. This can be removed if all - # tests are converted to use the correct casing. - categories_translation = {'approved': 'Approved', - 'code-review': 'Code-Review', - 'verified': 'Verified', - 'Approved': 'Approved', - 'Code-Review': 'Code-Review', - 'Verified': 'Verified'} - def __init__(self, gerrit, number, project, branch, subject, status='NEW', upstream_root=None, files={}): self.gerrit = gerrit @@ -301,7 +291,7 @@ class FakeGerritChange(object): "url": "https://hostname/3"}, "patchSet": self.patchsets[patchset - 1], "author": {"name": "User Name"}, - "approvals": [{"type": "code-review", + "approvals": [{"type": "Code-Review", "description": "Code-Review", "value": "0"}], "comment": "This is a comment"} @@ -341,8 +331,8 @@ class FakeGerritChange(object): if not granted_on: granted_on = time.time() approval = { - 'description': self.categories_translation[category], - 'type': self.categories_translation[category], + 'description': self.categories[category][0], + 'type': category, 'value': str(value), 'by': { 'username': username, @@ -351,8 +341,7 @@ class FakeGerritChange(object): 'grantedOn': int(granted_on) } for i, x in enumerate(self.patchsets[-1]['approvals'][:]): - if x['by']['username'] == username and \ - x['type'] == self.categories_translation[category]: + if x['by']['username'] == username and x['type'] == category: del self.patchsets[-1]['approvals'][i] self.patchsets[-1]['approvals'].append(approval) event = {'approvals': [approval], diff --git a/tests/unit/test_executor.py b/tests/unit/test_executor.py index 4700bd1191..f91b4fe893 100755 --- a/tests/unit/test_executor.py +++ b/tests/unit/test_executor.py @@ -86,10 +86,10 @@ class TestExecutorRepos(ZuulTestCase): projects = [p1, p2] A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B') - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) self.waitUntilSettled() @@ -124,12 +124,12 @@ class TestExecutorRepos(ZuulTestCase): B = self.fake_gerrit.addFakeChange('org/project2', 'stable/havana', 'B') C = self.fake_gerrit.addFakeChange('org/project3', 'master', 'C') - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - C.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) - self.fake_gerrit.addEvent(C.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + C.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(C.addApproval('Approved', 1)) self.waitUntilSettled() @@ -183,14 +183,14 @@ class TestExecutorRepos(ZuulTestCase): C = self.fake_gerrit.addFakeChange('org/project2', 'master', 'C') D = self.fake_gerrit.addFakeChange('org/project3', 'stable/havana', 'D') - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - C.addApproval('code-review', 2) - D.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) - self.fake_gerrit.addEvent(C.addApproval('approved', 1)) - self.fake_gerrit.addEvent(D.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + C.addApproval('Code-Review', 2) + D.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(C.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(D.addApproval('Approved', 1)) self.waitUntilSettled() diff --git a/tests/unit/test_openstack.py b/tests/unit/test_openstack.py index 4fceba01e8..980797f0db 100644 --- a/tests/unit/test_openstack.py +++ b/tests/unit/test_openstack.py @@ -27,8 +27,8 @@ class TestOpenStack(AnsibleZuulTestCase): def test_nova_master(self): A = self.fake_gerrit.addFakeChange('openstack/nova', 'master', 'A') - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(self.getJobFromHistory('python27').result, 'SUCCESS') @@ -44,8 +44,8 @@ class TestOpenStack(AnsibleZuulTestCase): self.create_branch('openstack/nova', 'stable/mitaka') A = self.fake_gerrit.addFakeChange('openstack/nova', 'stable/mitaka', 'A') - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(self.getJobFromHistory('python27').result, 'SUCCESS') diff --git a/tests/unit/test_requirements.py b/tests/unit/test_requirements.py index 7e578cf5d3..ff39fd74c5 100644 --- a/tests/unit/test_requirements.py +++ b/tests/unit/test_requirements.py @@ -37,21 +37,21 @@ class TestRequirementsApprovalNewerThan(ZuulTestCase): def _test_require_approval_newer_than(self, project, job): A = self.fake_gerrit.addFakeChange(project, 'master', 'A') # A comment event that we will keep submitting to trigger - comment = A.addApproval('code-review', 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 too-old +1, should not be enqueued - A.addApproval('verified', 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), 0) # Add a recent +1 - self.fake_gerrit.addEvent(A.addApproval('verified', 1, + self.fake_gerrit.addEvent(A.addApproval('Verified', 1, username='jenkins')) self.fake_gerrit.addEvent(comment) self.waitUntilSettled() @@ -77,20 +77,20 @@ class TestRequirementsApprovalOlderThan(ZuulTestCase): def _test_require_approval_older_than(self, project, job): A = self.fake_gerrit.addFakeChange(project, 'master', 'A') # A comment event that we will keep submitting to trigger - comment = A.addApproval('code-review', 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('verified', 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('verified', 1, username='jenkins', + A.addApproval('Verified', 1, username='jenkins', granted_on=time.time() - 72 * 60 * 60) self.fake_gerrit.addEvent(comment) self.waitUntilSettled() @@ -116,14 +116,14 @@ class TestRequirementsUserName(ZuulTestCase): def _test_require_approval_username(self, project, job): A = self.fake_gerrit.addFakeChange(project, 'master', 'A') # A comment event that we will keep submitting to trigger - comment = A.addApproval('code-review', 2, username='nobody') + comment = A.addApproval('Code-Review', 2, username='nobody') self.fake_gerrit.addEvent(comment) self.waitUntilSettled() # No approval from Jenkins so should not be enqueued self.assertEqual(len(self.history), 0) # Add an approval from Jenkins - A.addApproval('verified', 1, username='jenkins') + A.addApproval('Verified', 1, username='jenkins') self.fake_gerrit.addEvent(comment) self.waitUntilSettled() self.assertEqual(len(self.history), 1) @@ -148,14 +148,14 @@ class TestRequirementsEmail(ZuulTestCase): def _test_require_approval_email(self, project, job): A = self.fake_gerrit.addFakeChange(project, 'master', 'A') # A comment event that we will keep submitting to trigger - comment = A.addApproval('code-review', 2, username='nobody') + comment = A.addApproval('Code-Review', 2, username='nobody') self.fake_gerrit.addEvent(comment) self.waitUntilSettled() # No approval from Jenkins so should not be enqueued self.assertEqual(len(self.history), 0) # Add an approval from Jenkins - A.addApproval('verified', 1, username='jenkins') + A.addApproval('Verified', 1, username='jenkins') self.fake_gerrit.addEvent(comment) self.waitUntilSettled() self.assertEqual(len(self.history), 1) @@ -180,20 +180,20 @@ class TestRequirementsVote1(ZuulTestCase): def _test_require_approval_vote1(self, project, job): A = self.fake_gerrit.addFakeChange(project, 'master', 'A') # A comment event that we will keep submitting to trigger - comment = A.addApproval('code-review', 2, username='nobody') + comment = A.addApproval('Code-Review', 2, username='nobody') self.fake_gerrit.addEvent(comment) self.waitUntilSettled() # No approval from Jenkins so should not be enqueued self.assertEqual(len(self.history), 0) # A -1 from jenkins should not cause it to be enqueued - A.addApproval('verified', -1, username='jenkins') + A.addApproval('Verified', -1, username='jenkins') self.fake_gerrit.addEvent(comment) self.waitUntilSettled() self.assertEqual(len(self.history), 0) # A +1 should allow it to be enqueued - A.addApproval('verified', 1, username='jenkins') + A.addApproval('Verified', 1, username='jenkins') self.fake_gerrit.addEvent(comment) self.waitUntilSettled() self.assertEqual(len(self.history), 1) @@ -218,26 +218,26 @@ class TestRequirementsVote2(ZuulTestCase): def _test_require_approval_vote2(self, project, job): A = self.fake_gerrit.addFakeChange(project, 'master', 'A') # A comment event that we will keep submitting to trigger - comment = A.addApproval('code-review', 2, username='nobody') + comment = A.addApproval('Code-Review', 2, username='nobody') self.fake_gerrit.addEvent(comment) self.waitUntilSettled() # No approval from Jenkins so should not be enqueued self.assertEqual(len(self.history), 0) # A -1 from jenkins should not cause it to be enqueued - A.addApproval('verified', -1, username='jenkins') + A.addApproval('Verified', -1, username='jenkins') self.fake_gerrit.addEvent(comment) self.waitUntilSettled() self.assertEqual(len(self.history), 0) # A -2 from jenkins should not cause it to be enqueued - A.addApproval('verified', -2, username='jenkins') + A.addApproval('Verified', -2, username='jenkins') self.fake_gerrit.addEvent(comment) self.waitUntilSettled() self.assertEqual(len(self.history), 0) # A +1 from jenkins should allow it to be enqueued - A.addApproval('verified', 1, username='jenkins') + A.addApproval('Verified', 1, username='jenkins') self.fake_gerrit.addEvent(comment) self.waitUntilSettled() self.assertEqual(len(self.history), 1) @@ -246,13 +246,13 @@ class TestRequirementsVote2(ZuulTestCase): # A +2 from nobody should not cause it to be enqueued B = self.fake_gerrit.addFakeChange(project, 'master', 'B') # A comment event that we will keep submitting to trigger - comment = B.addApproval('code-review', 2, username='nobody') + comment = B.addApproval('Code-Review', 2, username='nobody') self.fake_gerrit.addEvent(comment) self.waitUntilSettled() self.assertEqual(len(self.history), 1) # A +2 from jenkins should allow it to be enqueued - B.addApproval('verified', 2, username='jenkins') + B.addApproval('Verified', 2, username='jenkins') self.fake_gerrit.addEvent(comment) self.waitUntilSettled() self.assertEqual(len(self.history), 2) @@ -269,10 +269,10 @@ class TestRequirementsState(ZuulTestCase): # comment on first patchset and check that no additional # jobs are run. A = self.fake_gerrit.addFakeChange('current-project', 'master', 'A') - self.fake_gerrit.addEvent(A.addApproval('code-review', 1)) + self.fake_gerrit.addEvent(A.addApproval('Code-Review', 1)) self.waitUntilSettled() A.addPatchset() - self.fake_gerrit.addEvent(A.addApproval('code-review', 1)) + self.fake_gerrit.addEvent(A.addApproval('Code-Review', 1)) self.waitUntilSettled() self.assertEqual(len(self.history), 2) # one job for each ps @@ -290,24 +290,24 @@ class TestRequirementsState(ZuulTestCase): def test_pipeline_require_open(self): A = self.fake_gerrit.addFakeChange('open-project', 'master', 'A', status='MERGED') - self.fake_gerrit.addEvent(A.addApproval('code-review', 2)) + self.fake_gerrit.addEvent(A.addApproval('Code-Review', 2)) self.waitUntilSettled() self.assertEqual(len(self.history), 0) B = self.fake_gerrit.addFakeChange('open-project', 'master', 'B') - self.fake_gerrit.addEvent(B.addApproval('code-review', 2)) + self.fake_gerrit.addEvent(B.addApproval('Code-Review', 2)) self.waitUntilSettled() self.assertEqual(len(self.history), 1) def test_pipeline_require_status(self): A = self.fake_gerrit.addFakeChange('status-project', 'master', 'A', status='MERGED') - self.fake_gerrit.addEvent(A.addApproval('code-review', 2)) + self.fake_gerrit.addEvent(A.addApproval('Code-Review', 2)) self.waitUntilSettled() self.assertEqual(len(self.history), 0) B = self.fake_gerrit.addFakeChange('status-project', 'master', 'B') - self.fake_gerrit.addEvent(B.addApproval('code-review', 2)) + self.fake_gerrit.addEvent(B.addApproval('Code-Review', 2)) self.waitUntilSettled() self.assertEqual(len(self.history), 1) @@ -326,21 +326,21 @@ class TestRequirementsRejectUsername(ZuulTestCase): self.assertEqual(len(self.history), 0) # add in a comment that will trigger - self.fake_gerrit.addEvent(A.addApproval('code-review', 1, + self.fake_gerrit.addEvent(A.addApproval('Code-Review', 1, username='reviewer')) self.waitUntilSettled() self.assertEqual(len(self.history), 1) self.assertEqual(self.history[0].name, job) # add in a comment from jenkins user which shouldn't trigger - self.fake_gerrit.addEvent(A.addApproval('verified', 1, + self.fake_gerrit.addEvent(A.addApproval('Verified', 1, username='jenkins')) self.waitUntilSettled() self.assertEqual(len(self.history), 1) # Check future reviews also won't trigger as a 'jenkins' user has # commented previously - self.fake_gerrit.addEvent(A.addApproval('code-review', 1, + self.fake_gerrit.addEvent(A.addApproval('Code-Review', 1, username='reviewer')) self.waitUntilSettled() self.assertEqual(len(self.history), 1) @@ -368,39 +368,39 @@ class TestRequirementsReject(ZuulTestCase): self.assertEqual(len(self.history), 0) # First positive vote should not queue until jenkins has +1'd - comment = A.addApproval('verified', 1, username='reviewer_a') + comment = A.addApproval('Verified', 1, username='reviewer_a') self.fake_gerrit.addEvent(comment) self.waitUntilSettled() self.assertEqual(len(self.history), 0) # Jenkins should put in a +1 which will also queue - comment = A.addApproval('verified', 1, username='jenkins') + comment = A.addApproval('Verified', 1, username='jenkins') self.fake_gerrit.addEvent(comment) self.waitUntilSettled() self.assertEqual(len(self.history), 1) self.assertEqual(self.history[0].name, job) # Negative vote should not queue - comment = A.addApproval('verified', -1, username='reviewer_b') + comment = A.addApproval('Verified', -1, username='reviewer_b') self.fake_gerrit.addEvent(comment) self.waitUntilSettled() self.assertEqual(len(self.history), 1) # Future approvals should do nothing - comment = A.addApproval('verified', 1, username='reviewer_c') + comment = A.addApproval('Verified', 1, username='reviewer_c') self.fake_gerrit.addEvent(comment) self.waitUntilSettled() self.assertEqual(len(self.history), 1) # Change/update negative vote should queue - comment = A.addApproval('verified', 1, username='reviewer_b') + comment = A.addApproval('Verified', 1, username='reviewer_b') self.fake_gerrit.addEvent(comment) self.waitUntilSettled() self.assertEqual(len(self.history), 2) self.assertEqual(self.history[1].name, job) # Future approvals should also queue - comment = A.addApproval('verified', 1, username='reviewer_d') + comment = A.addApproval('Verified', 1, username='reviewer_d') self.fake_gerrit.addEvent(comment) self.waitUntilSettled() self.assertEqual(len(self.history), 3) diff --git a/tests/unit/test_scheduler.py b/tests/unit/test_scheduler.py index 5fecfbefb2..f7da16b71f 100755 --- a/tests/unit/test_scheduler.py +++ b/tests/unit/test_scheduler.py @@ -49,8 +49,8 @@ class TestSchedulerSSL(SSLZuulTestCase): "Test that jobs are executed and a change is merged" A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(self.getJobFromHistory('project-merge').result, 'SUCCESS') @@ -72,8 +72,8 @@ class TestScheduler(ZuulTestCase): "Test that jobs are executed and a change is merged" A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(self.getJobFromHistory('project-merge').result, 'SUCCESS') @@ -121,8 +121,8 @@ class TestScheduler(ZuulTestCase): "Test the correct variant of a job runs on a branch" self.create_branch('org/project', 'stable') A = self.fake_gerrit.addFakeChange('org/project', 'stable', 'A') - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(self.getJobFromHistory('project-test1').result, 'SUCCESS') @@ -143,13 +143,13 @@ class TestScheduler(ZuulTestCase): A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - C.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + C.addApproval('Code-Review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) - self.fake_gerrit.addEvent(C.addApproval('approved', 1)) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(C.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(len(self.builds), 1) @@ -219,13 +219,13 @@ class TestScheduler(ZuulTestCase): A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) self.executor_server.failJob('project-test1', A) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) self.waitUntilSettled() self.assertBuilds([dict(name='project-merge', changes='1,1')]) @@ -279,17 +279,17 @@ class TestScheduler(ZuulTestCase): A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B') C = self.fake_gerrit.addFakeChange('org/project2', 'master', 'C') - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - C.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + C.addApproval('Code-Review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) self.waitUntilSettled() - self.fake_gerrit.addEvent(C.addApproval('approved', 1)) + self.fake_gerrit.addEvent(C.addApproval('Approved', 1)) self.waitUntilSettled() # There should be one merge job at the head of each queue running @@ -353,15 +353,15 @@ class TestScheduler(ZuulTestCase): A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - C.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + C.addApproval('Code-Review', 2) self.executor_server.failJob('project-test1', A) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) - self.fake_gerrit.addEvent(C.addApproval('approved', 1)) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(C.addApproval('Approved', 1)) self.waitUntilSettled() @@ -468,15 +468,15 @@ class TestScheduler(ZuulTestCase): A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - C.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + C.addApproval('Code-Review', 2) self.executor_server.failJob('project-test1', B) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) - self.fake_gerrit.addEvent(C.addApproval('approved', 1)) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(C.addApproval('Approved', 1)) self.waitUntilSettled() @@ -545,15 +545,15 @@ class TestScheduler(ZuulTestCase): A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - C.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + C.addApproval('Code-Review', 2) self.executor_server.failJob('project-test1', A) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) - self.fake_gerrit.addEvent(C.addApproval('approved', 1)) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(C.addApproval('Approved', 1)) self.waitUntilSettled() queue = self.gearman_server.getQueue() @@ -619,8 +619,8 @@ class TestScheduler(ZuulTestCase): def _test_time_database(self, iteration): self.executor_server.hold_jobs_in_build = True A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() time.sleep(2) @@ -664,16 +664,16 @@ class TestScheduler(ZuulTestCase): A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - C.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + C.addApproval('Code-Review', 2) self.executor_server.failJob('project-test1', A) self.executor_server.failJob('project-test1', B) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) - self.fake_gerrit.addEvent(C.addApproval('approved', 1)) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(C.addApproval('Approved', 1)) self.waitUntilSettled() self.executor_server.release('.*-merge') @@ -767,9 +767,9 @@ class TestScheduler(ZuulTestCase): A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - C.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + C.addApproval('Code-Review', 2) M2 = self.fake_gerrit.addFakeChange('org/project', 'master', 'M2') M1 = self.fake_gerrit.addFakeChange('org/project', 'master', 'M1') @@ -786,7 +786,7 @@ class TestScheduler(ZuulTestCase): A.setDependsOn(M1, 1) M1.setDependsOn(M2, 1) - self.fake_gerrit.addEvent(C.addApproval('approved', 1)) + self.fake_gerrit.addEvent(C.addApproval('Approved', 1)) self.waitUntilSettled() @@ -794,8 +794,8 @@ class TestScheduler(ZuulTestCase): self.assertEqual(B.data['status'], 'NEW') self.assertEqual(C.data['status'], 'NEW') - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(M2.queried, 0) @@ -830,14 +830,14 @@ class TestScheduler(ZuulTestCase): F.setDependsOn(B, 1) G.setDependsOn(A, 1) - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - C.addApproval('code-review', 2) - D.addApproval('code-review', 2) - E.addApproval('code-review', 2) - F.addApproval('code-review', 2) - G.addApproval('code-review', 2) - self.fake_gerrit.addEvent(C.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + C.addApproval('Code-Review', 2) + D.addApproval('Code-Review', 2) + E.addApproval('Code-Review', 2) + F.addApproval('Code-Review', 2) + G.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(C.addApproval('Approved', 1)) self.waitUntilSettled() @@ -859,13 +859,13 @@ class TestScheduler(ZuulTestCase): connection.maintainCache([]) self.executor_server.hold_jobs_in_build = True - A.addApproval('approved', 1) - B.addApproval('approved', 1) - D.addApproval('approved', 1) - E.addApproval('approved', 1) - F.addApproval('approved', 1) - G.addApproval('approved', 1) - self.fake_gerrit.addEvent(C.addApproval('approved', 1)) + A.addApproval('Approved', 1) + B.addApproval('Approved', 1) + D.addApproval('Approved', 1) + E.addApproval('Approved', 1) + F.addApproval('Approved', 1) + G.addApproval('Approved', 1) + self.fake_gerrit.addEvent(C.addApproval('Approved', 1)) for x in range(8): self.executor_server.release('.*-merge') @@ -898,8 +898,8 @@ class TestScheduler(ZuulTestCase): A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') X = self.fake_gerrit.addFakeChange('org/project', 'master', 'X') - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) M1 = self.fake_gerrit.addFakeChange('org/project', 'master', 'M1') M1.setMerged() @@ -907,7 +907,7 @@ class TestScheduler(ZuulTestCase): B.setDependsOn(A, 1) A.setDependsOn(M1, 1) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.fake_gerrit.addEvent(X.getPatchsetCreatedEvent(1)) self.waitUntilSettled() @@ -921,7 +921,7 @@ class TestScheduler(ZuulTestCase): build.release() self.waitUntilSettled() - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) self.waitUntilSettled() self.log.debug("len %s" % self.fake_gerrit._change_cache.keys()) @@ -956,11 +956,11 @@ class TestScheduler(ZuulTestCase): mgr = tenant.layout.pipelines['gate'].manager self.assertFalse(source.canMerge(a, mgr.getSubmitAllowNeeds())) - A.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) a = source.getChange(event, refresh=True) self.assertFalse(source.canMerge(a, mgr.getSubmitAllowNeeds())) - A.addApproval('approved', 1) + A.addApproval('Approved', 1) a = source.getChange(event, refresh=True) self.assertTrue(source.canMerge(a, mgr.getSubmitAllowNeeds())) @@ -976,12 +976,12 @@ class TestScheduler(ZuulTestCase): files={'conflict': 'bar'}) C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - C.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) - self.fake_gerrit.addEvent(C.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + C.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(C.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(A.reported, 1) @@ -1033,8 +1033,8 @@ class TestScheduler(ZuulTestCase): C.setDependsOn(B, 1) # A enters the gate queue; B and C enter the check queue - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1)) self.waitUntilSettled() @@ -1212,9 +1212,9 @@ class TestScheduler(ZuulTestCase): A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - C.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + C.addApproval('Code-Review', 2) M1 = self.fake_gerrit.addFakeChange('org/project', 'master', 'M1') M1.setMerged() @@ -1227,9 +1227,9 @@ class TestScheduler(ZuulTestCase): self.executor_server.failJob('project-merge', A) - self.fake_gerrit.addEvent(C.addApproval('approved', 1)) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + self.fake_gerrit.addEvent(C.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() @@ -1250,11 +1250,11 @@ class TestScheduler(ZuulTestCase): C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') D = self.fake_gerrit.addFakeChange('org/project', 'master', 'D') E = self.fake_gerrit.addFakeChange('org/project', 'master', 'E') - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - C.addApproval('code-review', 2) - D.addApproval('code-review', 2) - E.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + C.addApproval('Code-Review', 2) + D.addApproval('Code-Review', 2) + E.addApproval('Code-Review', 2) # E, D -> C -> B, A @@ -1263,11 +1263,11 @@ class TestScheduler(ZuulTestCase): self.executor_server.failJob('project-test1', B) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) - self.fake_gerrit.addEvent(D.addApproval('approved', 1)) - self.fake_gerrit.addEvent(C.addApproval('approved', 1)) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) - self.fake_gerrit.addEvent(E.addApproval('approved', 1)) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(D.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(C.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(E.addApproval('Approved', 1)) self.waitUntilSettled() self.executor_server.release('.*-merge') @@ -1316,16 +1316,16 @@ class TestScheduler(ZuulTestCase): A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - C.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + C.addApproval('Code-Review', 2) self.executor_server.failJob('project-test1', A) self.executor_server.failJob('project-test2', A) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) - self.fake_gerrit.addEvent(C.addApproval('approved', 1)) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(C.addApproval('Approved', 1)) self.waitUntilSettled() @@ -1374,9 +1374,9 @@ class TestScheduler(ZuulTestCase): A = self.fake_gerrit.addFakeChange('org/nonvoting-project', 'master', 'A') - A.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) self.executor_server.failJob('nonvoting-project-test2', A) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() @@ -1452,21 +1452,21 @@ class TestScheduler(ZuulTestCase): F = self.fake_gerrit.addFakeChange('org/project3', 'master', 'F') D.setDependsOn(C, 1) E.setDependsOn(D, 1) - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - C.addApproval('code-review', 2) - D.addApproval('code-review', 2) - E.addApproval('code-review', 2) - F.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + C.addApproval('Code-Review', 2) + D.addApproval('Code-Review', 2) + E.addApproval('Code-Review', 2) + F.addApproval('Code-Review', 2) A.fail_merge = True # Change object re-use in the gerrit trigger is hidden if # changes are added in quick succession; waiting makes it more # like real life. - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) self.waitUntilSettled() self.executor_server.release('.*-merge') @@ -1474,13 +1474,13 @@ class TestScheduler(ZuulTestCase): self.executor_server.release('.*-merge') self.waitUntilSettled() - self.fake_gerrit.addEvent(C.addApproval('approved', 1)) + self.fake_gerrit.addEvent(C.addApproval('Approved', 1)) self.waitUntilSettled() - self.fake_gerrit.addEvent(D.addApproval('approved', 1)) + self.fake_gerrit.addEvent(D.addApproval('Approved', 1)) self.waitUntilSettled() - self.fake_gerrit.addEvent(E.addApproval('approved', 1)) + self.fake_gerrit.addEvent(E.addApproval('Approved', 1)) self.waitUntilSettled() - self.fake_gerrit.addEvent(F.addApproval('approved', 1)) + self.fake_gerrit.addEvent(F.addApproval('Approved', 1)) self.waitUntilSettled() self.executor_server.release('.*-merge') @@ -1528,8 +1528,8 @@ class TestScheduler(ZuulTestCase): "Test that the merger works after a repack" A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(self.getJobFromHistory('project-merge').result, 'SUCCESS') @@ -1552,8 +1552,8 @@ class TestScheduler(ZuulTestCase): repack_repo(path) A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(self.getJobFromHistory('project-merge').result, 'SUCCESS') @@ -1587,8 +1587,8 @@ class TestScheduler(ZuulTestCase): if os.path.exists(path): repack_repo(path) - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(self.getJobFromHistory('project-merge').result, 'SUCCESS') @@ -1610,19 +1610,19 @@ class TestScheduler(ZuulTestCase): B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') D = self.fake_gerrit.addFakeChange('org/project', 'master', 'D') - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - C.addApproval('code-review', 2) - D.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + C.addApproval('Code-Review', 2) + D.addApproval('Code-Review', 2) C.setDependsOn(B, 1) B.setDependsOn(A, 1) A.setDependsOn(M, 1) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) - self.fake_gerrit.addEvent(C.addApproval('approved', 1)) - self.fake_gerrit.addEvent(D.addApproval('approved', 1)) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(C.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(D.addApproval('Approved', 1)) self.waitUntilSettled() B.addPatchset() @@ -1745,8 +1745,8 @@ class TestScheduler(ZuulTestCase): self.executor_server.hold_jobs_in_build = True A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(len(self.builds), 1, "One job being built (on hold)") self.assertEqual(self.builds[0].name, 'project-merge') @@ -1863,19 +1863,19 @@ class TestScheduler(ZuulTestCase): B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') D = self.fake_gerrit.addFakeChange('org/project', 'master', 'D') - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - C.addApproval('code-review', 2) - D.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + C.addApproval('Code-Review', 2) + D.addApproval('Code-Review', 2) C.setDependsOn(B, 1) B.setDependsOn(A, 1) A.setDependsOn(M, 1) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) - self.fake_gerrit.addEvent(C.addApproval('approved', 1)) - self.fake_gerrit.addEvent(D.addApproval('approved', 1)) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(C.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(D.addApproval('Approved', 1)) self.waitUntilSettled() A.addPatchset() @@ -1902,13 +1902,13 @@ class TestScheduler(ZuulTestCase): A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - C.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + C.addApproval('Code-Review', 2) - self.fake_gerrit.addEvent(C.addApproval('approved', 1)) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + self.fake_gerrit.addEvent(C.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() B.addPatchset() @@ -1959,8 +1959,8 @@ class TestScheduler(ZuulTestCase): def test_noop_job(self): "Test that the internal noop job works" A = self.fake_gerrit.addFakeChange('org/noop-project', 'master', 'A') - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(len(self.gearman_server.getQueue()), 0) @@ -2000,14 +2000,14 @@ class TestScheduler(ZuulTestCase): B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B') C = self.fake_gerrit.addFakeChange('org/project2', 'master', 'C') D = self.fake_gerrit.addFakeChange('org/project2', 'master', 'D') - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - C.addApproval('code-review', 2) - D.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) - self.fake_gerrit.addEvent(C.addApproval('approved', 1)) - self.fake_gerrit.addEvent(D.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + C.addApproval('Code-Review', 2) + D.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(C.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(D.addApproval('Approved', 1)) self.waitUntilSettled() self.executor_server.release('.*-merge') @@ -2064,8 +2064,8 @@ class TestScheduler(ZuulTestCase): "Test that if a worker fails to run a job, it is run again" self.executor_server.hold_jobs_in_build = True A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.builds[0].requeue = True @@ -2092,8 +2092,8 @@ class TestScheduler(ZuulTestCase): # We want to hold the project-merge job that the fake change enqueues self.gearman_server.hold_jobs_in_queue = True A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() # The assertion is that we have one job in the queue, project-merge self.assertEqual(len(self.gearman_server.getQueue()), 1) @@ -2141,10 +2141,10 @@ class TestScheduler(ZuulTestCase): A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') A.addPatchset({'pip-requires': 'foo'}) B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) self.waitUntilSettled() testfile_jobs = [x for x in self.history @@ -2220,8 +2220,8 @@ class TestScheduler(ZuulTestCase): self.executor_server.hold_jobs_in_build = True A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.gearman_server.hold_jobs_in_queue = False @@ -2245,8 +2245,8 @@ class TestScheduler(ZuulTestCase): "Test that we can retrieve JSON status info" self.executor_server.hold_jobs_in_build = True A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.executor_server.release('project-merge') @@ -2349,8 +2349,8 @@ class TestScheduler(ZuulTestCase): "Test that live reconfiguration works" self.executor_server.hold_jobs_in_build = True A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.sched.reconfigure(self.config) @@ -2381,17 +2381,17 @@ class TestScheduler(ZuulTestCase): # next change. This change will succeed and merge. A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') A.addPatchset({'conflict': 'A'}) - A.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) # This change will be in merge conflict. During the # reconfiguration, we will add a job. We want to make sure # that doesn't cause it to get stuck. B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') B.addPatchset({'conflict': 'B'}) - B.addApproval('code-review', 2) + B.addApproval('Code-Review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) self.waitUntilSettled() @@ -2436,16 +2436,16 @@ class TestScheduler(ZuulTestCase): # reconfiguration. This change will succeed and merge. A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') A.addPatchset({'conflict': 'A'}) - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.executor_server.release('.*-merge') self.waitUntilSettled() B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') self.executor_server.failJob('project-merge', B) - B.addApproval('code-review', 2) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) + B.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) self.waitUntilSettled() self.executor_server.release('.*-merge') @@ -2604,11 +2604,11 @@ class TestScheduler(ZuulTestCase): A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B') B.setDependsOn(A, 1) - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) # Add the parent change. - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.executor_server.release('.*-merge') self.waitUntilSettled() @@ -2618,7 +2618,7 @@ class TestScheduler(ZuulTestCase): self.waitUntilSettled() # Add the child change. - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) self.waitUntilSettled() self.executor_server.release('.*-merge') self.waitUntilSettled() @@ -2650,7 +2650,7 @@ class TestScheduler(ZuulTestCase): # A Depends-On: B A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( A.subject, B.data['id']) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) self.fake_gerrit.addEvent(C.getPatchsetCreatedEvent(1)) @@ -2700,8 +2700,8 @@ class TestScheduler(ZuulTestCase): self.init_repo("org/new-project") A = self.fake_gerrit.addFakeChange('org/new-project', 'master', 'A') - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(self.getJobFromHistory('project-merge').result, 'SUCCESS') @@ -2717,8 +2717,8 @@ class TestScheduler(ZuulTestCase): self.init_repo("org/delete-project") A = self.fake_gerrit.addFakeChange('org/delete-project', 'master', 'A') - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(self.getJobFromHistory('project-merge').result, 'SUCCESS') @@ -2738,8 +2738,8 @@ class TestScheduler(ZuulTestCase): B = self.fake_gerrit.addFakeChange('org/delete-project', 'master', 'B') - B.addApproval('code-review', 2) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) + B.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(self.getJobFromHistory('project-merge').result, 'SUCCESS') @@ -2975,8 +2975,8 @@ class TestScheduler(ZuulTestCase): def test_client_enqueue_change(self): "Test that the RPC client can enqueue a change" A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') - A.addApproval('code-review', 2) - A.addApproval('approved', 1) + A.addApproval('Code-Review', 2) + A.addApproval('Approved', 1) client = zuul.rpcclient.RPCClient('127.0.0.1', self.gearman_server.port) @@ -3077,13 +3077,13 @@ class TestScheduler(ZuulTestCase): A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - C.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + C.addApproval('Code-Review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) - self.fake_gerrit.addEvent(C.addApproval('approved', 1)) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(C.addApproval('Approved', 1)) self.waitUntilSettled() @@ -3157,13 +3157,13 @@ class TestScheduler(ZuulTestCase): C.setDependsOn(B, 1) - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - C.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + C.addApproval('Code-Review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) - self.fake_gerrit.addEvent(C.addApproval('approved', 1)) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(C.addApproval('Approved', 1)) self.waitUntilSettled() @@ -3218,8 +3218,8 @@ class TestScheduler(ZuulTestCase): "Test that the RPC client returns errors for promotion" self.executor_server.hold_jobs_in_build = True A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() client = zuul.rpcclient.RPCClient('127.0.0.1', @@ -3253,13 +3253,13 @@ class TestScheduler(ZuulTestCase): C.setDependsOn(B, 1) self.executor_server.failJob('project-test1', A) - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - C.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + C.addApproval('Code-Review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) - self.fake_gerrit.addEvent(C.addApproval('approved', 1)) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(C.addApproval('Approved', 1)) self.waitUntilSettled() # Only A and B will have their merge jobs queued because @@ -3345,13 +3345,13 @@ class TestScheduler(ZuulTestCase): self.executor_server.failJob('project-test1', A) - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - C.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + C.addApproval('Code-Review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) - self.fake_gerrit.addEvent(C.addApproval('approved', 1)) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(C.addApproval('Approved', 1)) self.waitUntilSettled() # Only A and B will have their merge jobs queued because @@ -3407,8 +3407,8 @@ class TestScheduler(ZuulTestCase): self.executor_server.hold_jobs_in_build = True A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(len(self.executor_client.builds), 1) @@ -3438,14 +3438,14 @@ class TestScheduler(ZuulTestCase): def test_footer_message(self): "Test a pipeline's footer message is correctly added to the report." A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') - A.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) self.executor_server.failJob('project-test1', A) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') - B.addApproval('code-review', 2) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) + B.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(2, len(self.smtp_messages)) @@ -3525,9 +3525,9 @@ For CI problems and help debugging, contact ci@example.org""" # Check a test failure isn't reported to SMTP A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') - A.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) self.executor_server.failJob('project-test1', A) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(3, len(self.history)) # 3 jobs @@ -3539,10 +3539,10 @@ For CI problems and help debugging, contact ci@example.org""" B.addPatchset(['conflict']) C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') C.addPatchset(['conflict']) - B.addApproval('code-review', 2) - C.addApproval('code-review', 2) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) - self.fake_gerrit.addEvent(C.addApproval('approved', 1)) + B.addApproval('Code-Review', 2) + C.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(C.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(6, len(self.history)) # A and B jobs @@ -3559,10 +3559,10 @@ For CI problems and help debugging, contact ci@example.org""" A.addPatchset(['conflict']) B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') B.addPatchset(['conflict']) - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(3, len(self.history)) # A jobs @@ -3580,8 +3580,8 @@ For CI problems and help debugging, contact ci@example.org""" "Test that the RPC client can get a list of running jobs" self.executor_server.hold_jobs_in_build = True A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() client = zuul.rpcclient.RPCClient('127.0.0.1', @@ -3661,8 +3661,8 @@ For CI problems and help debugging, contact ci@example.org""" "Test cross-repo dependencies" A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B') - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) AM2 = self.fake_gerrit.addFakeChange('org/project1', 'master', 'AM2') AM1 = self.fake_gerrit.addFakeChange('org/project1', 'master', 'AM1') @@ -3690,7 +3690,7 @@ For CI problems and help debugging, contact ci@example.org""" A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( A.subject, B.data['id']) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(A.data['status'], 'NEW') @@ -3700,8 +3700,8 @@ For CI problems and help debugging, contact ci@example.org""" connection.maintainCache([]) self.executor_server.hold_jobs_in_build = True - B.addApproval('approved', 1) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + B.addApproval('Approved', 1) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.executor_server.release('.*-merge') @@ -3731,18 +3731,18 @@ For CI problems and help debugging, contact ci@example.org""" B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B') C = self.fake_gerrit.addFakeChange('org/project2', 'mp', 'C') C.data['id'] = B.data['id'] - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - C.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + C.addApproval('Code-Review', 2) # A Depends-On: B+C A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( A.subject, B.data['id']) self.executor_server.hold_jobs_in_build = True - B.addApproval('approved', 1) - C.addApproval('approved', 1) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + B.addApproval('Approved', 1) + C.addApproval('Approved', 1) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.executor_server.release('.*-merge') @@ -3771,18 +3771,18 @@ For CI problems and help debugging, contact ci@example.org""" A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B') C = self.fake_gerrit.addFakeChange('org/project2', 'master', 'C') - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - C.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + C.addApproval('Code-Review', 2) # A Depends-On: B+C A.data['commitMessage'] = '%s\n\nDepends-On: %s\nDepends-On: %s\n' % ( A.subject, B.data['id'], C.data['id']) self.executor_server.hold_jobs_in_build = True - B.addApproval('approved', 1) - C.addApproval('approved', 1) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + B.addApproval('Approved', 1) + C.addApproval('Approved', 1) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.executor_server.release('.*-merge') @@ -3810,8 +3810,8 @@ For CI problems and help debugging, contact ci@example.org""" "Test cross-repo dependencies in unshared gate queues" A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) # A Depends-On: B A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( @@ -3819,8 +3819,8 @@ For CI problems and help debugging, contact ci@example.org""" # A and B do not share a queue, make sure that A is unable to # enqueue B (and therefore, A is unable to be enqueued). - B.addApproval('approved', 1) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + B.addApproval('Approved', 1) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(A.data['status'], 'NEW') @@ -3830,7 +3830,7 @@ For CI problems and help debugging, contact ci@example.org""" self.assertEqual(len(self.history), 0) # Enqueue and merge B alone. - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(B.data['status'], 'MERGED') @@ -3838,7 +3838,7 @@ For CI problems and help debugging, contact ci@example.org""" # Now that B is merged, A should be able to be enqueued and # merged. - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(A.data['status'], 'MERGED') @@ -3848,23 +3848,23 @@ For CI problems and help debugging, contact ci@example.org""" "Test reverse cross-repo dependencies" A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B') - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) # A Depends-On: B A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( A.subject, B.data['id']) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(A.data['status'], 'NEW') self.assertEqual(B.data['status'], 'NEW') self.executor_server.hold_jobs_in_build = True - A.addApproval('approved', 1) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) + A.addApproval('Approved', 1) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) self.waitUntilSettled() self.executor_server.release('.*-merge') @@ -3888,8 +3888,8 @@ For CI problems and help debugging, contact ci@example.org""" "Test cross-repo dependency cycles" A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B') - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) # A -> B -> A (via commit-depends) @@ -3898,7 +3898,7 @@ For CI problems and help debugging, contact ci@example.org""" B.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( B.subject, A.data['id']) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(A.reported, 0) @@ -3911,15 +3911,15 @@ For CI problems and help debugging, contact ci@example.org""" self.init_repo("org/unknown", tag='init') A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') B = self.fake_gerrit.addFakeChange('org/unknown', 'master', 'B') - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) # A Depends-On: B A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( A.subject, B.data['id']) - B.addApproval('approved', 1) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + B.addApproval('Approved', 1) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() # Unknown projects cannot share a queue with any other @@ -3937,13 +3937,13 @@ For CI problems and help debugging, contact ci@example.org""" # event triggers a gerrit query to update the change, we get # the information that it was merged. B.setMerged() - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(len(self.history), 0) # Now that B is merged, A should be able to be enqueued and # merged. - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(A.data['status'], 'MERGED') @@ -4390,10 +4390,10 @@ For CI problems and help debugging, contact ci@example.org""" 'master', 'A') B = self.fake_gerrit.addFakeChange('org/one-job-project', 'master', 'B') - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(A.data['status'], 'MERGED') @@ -4437,8 +4437,8 @@ For CI problems and help debugging, contact ci@example.org""" self.fake_nodepool.paused = True A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.zk.client.stop() @@ -4454,8 +4454,8 @@ For CI problems and help debugging, contact ci@example.org""" self.fake_nodepool.paused = True A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() req = self.fake_nodepool.getNodeRequests()[0] @@ -4499,8 +4499,8 @@ class TestExecutor(ZuulTestCase): self.executor_server.hold_jobs_in_build = True A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() @@ -4521,8 +4521,8 @@ class TestDependencyGraph(ZuulTestCase): self.executor_server.hold_jobs_in_build = True change = self.fake_gerrit.addFakeChange( 'org/project', 'master', 'change') - change.addApproval('code-review', 2) - self.fake_gerrit.addEvent(change.addApproval('approved', 1)) + change.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(change.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual([b.name for b in self.builds], ['A']) @@ -4579,11 +4579,11 @@ class TestDependencyGraph(ZuulTestCase): self.executor_server.hold_jobs_in_build = True change = self.fake_gerrit.addFakeChange( 'org/project', 'master', 'change') - change.addApproval('code-review', 2) + change.addApproval('Code-Review', 2) self.executor_server.failJob('C', change) - self.fake_gerrit.addEvent(change.addApproval('approved', 1)) + self.fake_gerrit.addEvent(change.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual([b.name for b in self.builds], ['A']) @@ -4738,12 +4738,12 @@ class TestSchedulerMerges(ZuulTestCase): A = self.fake_gerrit.addFakeChange(project, 'master', 'A') B = self.fake_gerrit.addFakeChange(project, 'master', 'B') C = self.fake_gerrit.addFakeChange(project, 'master', 'C') - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - C.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) - self.fake_gerrit.addEvent(C.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + C.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(C.addApproval('Approved', 1)) self.waitUntilSettled() build = self.builds[-1] @@ -4800,12 +4800,12 @@ class TestSchedulerMerges(ZuulTestCase): 'org/project-merge-branches', 'mp', 'B') C = self.fake_gerrit.addFakeChange( 'org/project-merge-branches', 'mp', 'C') - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - C.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) - self.fake_gerrit.addEvent(C.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + C.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(C.addApproval('Approved', 1)) self.waitUntilSettled() self.executor_server.release('.*-merge') @@ -4845,12 +4845,12 @@ class TestSchedulerMerges(ZuulTestCase): 'org/project-merge-branches', 'mp', 'B') C = self.fake_gerrit.addFakeChange( 'org/project-merge-branches', 'master', 'C') - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - C.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) - self.fake_gerrit.addEvent(C.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + C.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(C.addApproval('Approved', 1)) self.waitUntilSettled() job_A = None @@ -5339,12 +5339,12 @@ class TestSemaphoreInRepo(ZuulTestCase): self.executor_server.hold_jobs_in_build = True - A.addApproval('code-review', 2) - B.addApproval('code-review', 2) - C.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) - self.fake_gerrit.addEvent(C.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + B.addApproval('Code-Review', 2) + C.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) + self.fake_gerrit.addEvent(C.addApproval('Approved', 1)) self.waitUntilSettled() # check that the layout in a queue item still has max value of 1 diff --git a/tests/unit/test_v3.py b/tests/unit/test_v3.py index fb80660818..765c78d557 100644 --- a/tests/unit/test_v3.py +++ b/tests/unit/test_v3.py @@ -31,8 +31,8 @@ class TestMultipleTenants(AnsibleZuulTestCase): def test_multiple_tenants(self): A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(self.getJobFromHistory('project1-test1').result, 'SUCCESS') @@ -47,8 +47,8 @@ class TestMultipleTenants(AnsibleZuulTestCase): "A should *not* transit tenant-two gate") B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B') - B.addApproval('code-review', 2) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) + B.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(self.getJobFromHistory('python27', 'org/project2').result, @@ -74,8 +74,8 @@ class TestInRepoConfig(ZuulTestCase): def test_in_repo_config(self): A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(self.getJobFromHistory('project-test1').result, 'SUCCESS') @@ -108,8 +108,8 @@ class TestInRepoConfig(ZuulTestCase): 'playbooks/project-test2.yaml': in_repo_playbook} A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A', files=file_dict) - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(A.data['status'], 'MERGED') self.assertEqual(A.reported, 2, @@ -125,8 +125,8 @@ class TestInRepoConfig(ZuulTestCase): # Now that the config change is landed, it should be live for # subsequent changes. B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') - B.addApproval('code-review', 2) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) + B.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(self.getJobFromHistory('project-test2').result, 'SUCCESS') @@ -229,8 +229,8 @@ class TestInRepoConfig(ZuulTestCase): 'playbooks/project-test2.yaml': in_repo_playbook} A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A', files=file_dict) - A.addApproval('approved', 1) - self.fake_gerrit.addEvent(A.addApproval('code-review', 2)) + A.addApproval('Approved', 1) + self.fake_gerrit.addEvent(A.addApproval('Code-Review', 2)) self.waitUntilSettled() items = gate_pipeline.getAllItems() @@ -269,8 +269,8 @@ class TestInRepoConfig(ZuulTestCase): self.create_branch('org/project', 'stable') A = self.fake_gerrit.addFakeChange('org/project', 'stable', 'A', files=file_dict) - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(A.data['status'], 'MERGED') self.assertEqual(A.reported, 2, @@ -284,8 +284,8 @@ class TestInRepoConfig(ZuulTestCase): # The config change should not affect master. B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') - B.addApproval('code-review', 2) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) + B.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) self.waitUntilSettled() self.assertHistory([ dict(name='project-test2', result='SUCCESS', changes='1,1'), @@ -294,8 +294,8 @@ class TestInRepoConfig(ZuulTestCase): # The config change should be live for further changes on # stable. C = self.fake_gerrit.addFakeChange('org/project', 'stable', 'C') - C.addApproval('code-review', 2) - self.fake_gerrit.addEvent(C.addApproval('approved', 1)) + C.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(C.addApproval('Approved', 1)) self.waitUntilSettled() self.assertHistory([ dict(name='project-test2', result='SUCCESS', changes='1,1'), @@ -368,8 +368,8 @@ class TestInRepoConfig(ZuulTestCase): file_dict = {'.zuul.yaml': in_repo_conf} A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A', files=file_dict) - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(A.data['status'], 'NEW') @@ -389,8 +389,8 @@ class TestInRepoConfig(ZuulTestCase): file_dict = {'zuul.yaml': in_repo_conf} A = self.fake_gerrit.addFakeChange('common-config', 'master', 'A', files=file_dict) - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(A.data['status'], 'NEW') @@ -409,8 +409,8 @@ class TestInRepoConfig(ZuulTestCase): file_dict = {'.zuul.yaml': in_repo_conf} A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A', files=file_dict) - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(A.data['status'], 'NEW') @@ -429,8 +429,8 @@ class TestInRepoConfig(ZuulTestCase): file_dict = {'.zuul.yaml': in_repo_conf} A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A', files=file_dict) - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(A.data['status'], 'NEW') @@ -449,8 +449,8 @@ class TestInRepoConfig(ZuulTestCase): file_dict = {'.zuul.yaml': in_repo_conf} A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A', files=file_dict) - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(A.data['status'], 'NEW') @@ -469,8 +469,8 @@ class TestInRepoConfig(ZuulTestCase): file_dict = {'.zuul.yaml': in_repo_conf} A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A', files=file_dict) - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(A.data['status'], 'NEW') @@ -494,8 +494,8 @@ class TestInRepoConfig(ZuulTestCase): file_dict = {'.zuul.yaml': in_repo_conf} A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A', files=file_dict) - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(A.data['status'], 'NEW') @@ -522,8 +522,8 @@ class TestInRepoConfig(ZuulTestCase): file_dict = {'.zuul.yaml': in_repo_conf} A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A', files=file_dict) - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(A.data['status'], 'NEW') @@ -549,8 +549,8 @@ class TestInRepoConfig(ZuulTestCase): file_dict = {'.zuul.yaml': downstream_repo_conf} A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A', files=file_dict) - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(A.data['status'], 'MERGED') @@ -575,8 +575,8 @@ class TestInRepoConfig(ZuulTestCase): file_dict = {'.zuul.yaml': upstream_repo_conf} B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B', files=file_dict) - B.addApproval('code-review', 2) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) + B.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(B.data['status'], 'MERGED') diff --git a/tests/unit/test_webapp.py b/tests/unit/test_webapp.py index da027c1df4..5b6950b087 100644 --- a/tests/unit/test_webapp.py +++ b/tests/unit/test_webapp.py @@ -31,11 +31,11 @@ class TestWebapp(ZuulTestCase): super(TestWebapp, self).setUp() self.executor_server.hold_jobs_in_build = True A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B') - B.addApproval('code-review', 2) - self.fake_gerrit.addEvent(B.addApproval('approved', 1)) + B.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) self.waitUntilSettled() self.port = self.webapp.server.socket.getsockname()[1] diff --git a/tests/unit/test_zuultrigger.py b/tests/unit/test_zuultrigger.py index 476cb742a2..3c4dead9f6 100644 --- a/tests/unit/test_zuultrigger.py +++ b/tests/unit/test_zuultrigger.py @@ -31,17 +31,17 @@ class TestZuulTriggerParentChangeEnqueued(ZuulTestCase): A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') B1 = self.fake_gerrit.addFakeChange('org/project', 'master', 'B1') B2 = self.fake_gerrit.addFakeChange('org/project', 'master', 'B2') - A.addApproval('code-review', 2) - B1.addApproval('code-review', 2) - B2.addApproval('code-review', 2) - A.addApproval('verified', 1) # required by gate - B1.addApproval('verified', -1) # should go to check - B2.addApproval('verified', 1) # should go to gate - B1.addApproval('approved', 1) - B2.addApproval('approved', 1) + A.addApproval('Code-Review', 2) + B1.addApproval('Code-Review', 2) + B2.addApproval('Code-Review', 2) + A.addApproval('Verified', 1) # required by gate + B1.addApproval('Verified', -1) # should go to check + B2.addApproval('Verified', 1) # should go to gate + B1.addApproval('Approved', 1) + B2.addApproval('Approved', 1) B1.setDependsOn(A, 1) B2.setDependsOn(A, 1) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) # Jobs are being held in build to make sure that 3,1 has time # to enqueue behind 1,1 so that the test is more # deterministic. @@ -85,8 +85,8 @@ class TestZuulTriggerProjectChangeMerged(ZuulTestCase): B.addPatchset({'conflict': 'bar'}) D.addPatchset({'conflict2': 'foo'}) E.addPatchset({'conflict2': 'bar'}) - A.addApproval('code-review', 2) - self.fake_gerrit.addEvent(A.addApproval('approved', 1)) + A.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(len(self.history), 1) @@ -112,8 +112,8 @@ class TestZuulTriggerProjectChangeMerged(ZuulTestCase): # configuration. self.sched.reconfigure(self.config) - D.addApproval('code-review', 2) - self.fake_gerrit.addEvent(D.addApproval('approved', 1)) + D.addApproval('Code-Review', 2) + self.fake_gerrit.addEvent(D.addApproval('Approved', 1)) self.waitUntilSettled() self.assertEqual(len(self.history), 2)