Use correct label casing in tests
This cleans up the casing in the tests and removes the temporary translation table in the base test class. Change-Id: I7a9aff57de3699ca1689fa147c6fcdea677e16fd
This commit is contained in:
parent
ea98a194cc
commit
bf24fd14ce
|
@ -137,16 +137,6 @@ class FakeGerritChange(object):
|
||||||
'Code-Review': ('Code-Review', -2, 2),
|
'Code-Review': ('Code-Review', -2, 2),
|
||||||
'Verified': ('Verified', -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,
|
def __init__(self, gerrit, number, project, branch, subject,
|
||||||
status='NEW', upstream_root=None, files={}):
|
status='NEW', upstream_root=None, files={}):
|
||||||
self.gerrit = gerrit
|
self.gerrit = gerrit
|
||||||
|
@ -301,7 +291,7 @@ class FakeGerritChange(object):
|
||||||
"url": "https://hostname/3"},
|
"url": "https://hostname/3"},
|
||||||
"patchSet": self.patchsets[patchset - 1],
|
"patchSet": self.patchsets[patchset - 1],
|
||||||
"author": {"name": "User Name"},
|
"author": {"name": "User Name"},
|
||||||
"approvals": [{"type": "code-review",
|
"approvals": [{"type": "Code-Review",
|
||||||
"description": "Code-Review",
|
"description": "Code-Review",
|
||||||
"value": "0"}],
|
"value": "0"}],
|
||||||
"comment": "This is a comment"}
|
"comment": "This is a comment"}
|
||||||
|
@ -341,8 +331,8 @@ class FakeGerritChange(object):
|
||||||
if not granted_on:
|
if not granted_on:
|
||||||
granted_on = time.time()
|
granted_on = time.time()
|
||||||
approval = {
|
approval = {
|
||||||
'description': self.categories_translation[category],
|
'description': self.categories[category][0],
|
||||||
'type': self.categories_translation[category],
|
'type': category,
|
||||||
'value': str(value),
|
'value': str(value),
|
||||||
'by': {
|
'by': {
|
||||||
'username': username,
|
'username': username,
|
||||||
|
@ -351,8 +341,7 @@ class FakeGerritChange(object):
|
||||||
'grantedOn': int(granted_on)
|
'grantedOn': int(granted_on)
|
||||||
}
|
}
|
||||||
for i, x in enumerate(self.patchsets[-1]['approvals'][:]):
|
for i, x in enumerate(self.patchsets[-1]['approvals'][:]):
|
||||||
if x['by']['username'] == username and \
|
if x['by']['username'] == username and x['type'] == category:
|
||||||
x['type'] == self.categories_translation[category]:
|
|
||||||
del self.patchsets[-1]['approvals'][i]
|
del self.patchsets[-1]['approvals'][i]
|
||||||
self.patchsets[-1]['approvals'].append(approval)
|
self.patchsets[-1]['approvals'].append(approval)
|
||||||
event = {'approvals': [approval],
|
event = {'approvals': [approval],
|
||||||
|
|
|
@ -86,10 +86,10 @@ class TestExecutorRepos(ZuulTestCase):
|
||||||
projects = [p1, p2]
|
projects = [p1, p2]
|
||||||
A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
|
A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
|
||||||
B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B')
|
B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B')
|
||||||
A.addApproval('code-review', 2)
|
A.addApproval('Code-Review', 2)
|
||||||
B.addApproval('code-review', 2)
|
B.addApproval('Code-Review', 2)
|
||||||
self.fake_gerrit.addEvent(A.addApproval('approved', 1))
|
self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
|
||||||
self.fake_gerrit.addEvent(B.addApproval('approved', 1))
|
self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
|
||||||
|
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
|
|
||||||
|
@ -124,12 +124,12 @@ class TestExecutorRepos(ZuulTestCase):
|
||||||
B = self.fake_gerrit.addFakeChange('org/project2', 'stable/havana',
|
B = self.fake_gerrit.addFakeChange('org/project2', 'stable/havana',
|
||||||
'B')
|
'B')
|
||||||
C = self.fake_gerrit.addFakeChange('org/project3', 'master', 'C')
|
C = self.fake_gerrit.addFakeChange('org/project3', 'master', 'C')
|
||||||
A.addApproval('code-review', 2)
|
A.addApproval('Code-Review', 2)
|
||||||
B.addApproval('code-review', 2)
|
B.addApproval('Code-Review', 2)
|
||||||
C.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.fake_gerrit.addEvent(B.addApproval('approved', 1))
|
self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
|
||||||
self.fake_gerrit.addEvent(C.addApproval('approved', 1))
|
self.fake_gerrit.addEvent(C.addApproval('Approved', 1))
|
||||||
|
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
|
|
||||||
|
@ -183,14 +183,14 @@ class TestExecutorRepos(ZuulTestCase):
|
||||||
C = self.fake_gerrit.addFakeChange('org/project2', 'master', 'C')
|
C = self.fake_gerrit.addFakeChange('org/project2', 'master', 'C')
|
||||||
D = self.fake_gerrit.addFakeChange('org/project3', 'stable/havana',
|
D = self.fake_gerrit.addFakeChange('org/project3', 'stable/havana',
|
||||||
'D')
|
'D')
|
||||||
A.addApproval('code-review', 2)
|
A.addApproval('Code-Review', 2)
|
||||||
B.addApproval('code-review', 2)
|
B.addApproval('Code-Review', 2)
|
||||||
C.addApproval('code-review', 2)
|
C.addApproval('Code-Review', 2)
|
||||||
D.addApproval('code-review', 2)
|
D.addApproval('Code-Review', 2)
|
||||||
self.fake_gerrit.addEvent(A.addApproval('approved', 1))
|
self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
|
||||||
self.fake_gerrit.addEvent(B.addApproval('approved', 1))
|
self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
|
||||||
self.fake_gerrit.addEvent(C.addApproval('approved', 1))
|
self.fake_gerrit.addEvent(C.addApproval('Approved', 1))
|
||||||
self.fake_gerrit.addEvent(D.addApproval('approved', 1))
|
self.fake_gerrit.addEvent(D.addApproval('Approved', 1))
|
||||||
|
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
|
|
||||||
|
|
|
@ -27,8 +27,8 @@ class TestOpenStack(AnsibleZuulTestCase):
|
||||||
|
|
||||||
def test_nova_master(self):
|
def test_nova_master(self):
|
||||||
A = self.fake_gerrit.addFakeChange('openstack/nova', 'master', 'A')
|
A = self.fake_gerrit.addFakeChange('openstack/nova', 'master', 'A')
|
||||||
A.addApproval('code-review', 2)
|
A.addApproval('Code-Review', 2)
|
||||||
self.fake_gerrit.addEvent(A.addApproval('approved', 1))
|
self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.assertEqual(self.getJobFromHistory('python27').result,
|
self.assertEqual(self.getJobFromHistory('python27').result,
|
||||||
'SUCCESS')
|
'SUCCESS')
|
||||||
|
@ -44,8 +44,8 @@ class TestOpenStack(AnsibleZuulTestCase):
|
||||||
self.create_branch('openstack/nova', 'stable/mitaka')
|
self.create_branch('openstack/nova', 'stable/mitaka')
|
||||||
A = self.fake_gerrit.addFakeChange('openstack/nova',
|
A = self.fake_gerrit.addFakeChange('openstack/nova',
|
||||||
'stable/mitaka', 'A')
|
'stable/mitaka', 'A')
|
||||||
A.addApproval('code-review', 2)
|
A.addApproval('Code-Review', 2)
|
||||||
self.fake_gerrit.addEvent(A.addApproval('approved', 1))
|
self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.assertEqual(self.getJobFromHistory('python27').result,
|
self.assertEqual(self.getJobFromHistory('python27').result,
|
||||||
'SUCCESS')
|
'SUCCESS')
|
||||||
|
|
|
@ -37,21 +37,21 @@ class TestRequirementsApprovalNewerThan(ZuulTestCase):
|
||||||
def _test_require_approval_newer_than(self, project, job):
|
def _test_require_approval_newer_than(self, project, job):
|
||||||
A = self.fake_gerrit.addFakeChange(project, 'master', 'A')
|
A = self.fake_gerrit.addFakeChange(project, 'master', 'A')
|
||||||
# A comment event that we will keep submitting to trigger
|
# 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.fake_gerrit.addEvent(comment)
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
# No +1 from Jenkins so should not be enqueued
|
# No +1 from Jenkins so should not be enqueued
|
||||||
self.assertEqual(len(self.history), 0)
|
self.assertEqual(len(self.history), 0)
|
||||||
|
|
||||||
# Add a too-old +1, should not be enqueued
|
# 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)
|
granted_on=time.time() - 72 * 60 * 60)
|
||||||
self.fake_gerrit.addEvent(comment)
|
self.fake_gerrit.addEvent(comment)
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.assertEqual(len(self.history), 0)
|
self.assertEqual(len(self.history), 0)
|
||||||
|
|
||||||
# Add a recent +1
|
# Add a recent +1
|
||||||
self.fake_gerrit.addEvent(A.addApproval('verified', 1,
|
self.fake_gerrit.addEvent(A.addApproval('Verified', 1,
|
||||||
username='jenkins'))
|
username='jenkins'))
|
||||||
self.fake_gerrit.addEvent(comment)
|
self.fake_gerrit.addEvent(comment)
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
|
@ -77,20 +77,20 @@ class TestRequirementsApprovalOlderThan(ZuulTestCase):
|
||||||
def _test_require_approval_older_than(self, project, job):
|
def _test_require_approval_older_than(self, project, job):
|
||||||
A = self.fake_gerrit.addFakeChange(project, 'master', 'A')
|
A = self.fake_gerrit.addFakeChange(project, 'master', 'A')
|
||||||
# A comment event that we will keep submitting to trigger
|
# 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.fake_gerrit.addEvent(comment)
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
# No +1 from Jenkins so should not be enqueued
|
# No +1 from Jenkins so should not be enqueued
|
||||||
self.assertEqual(len(self.history), 0)
|
self.assertEqual(len(self.history), 0)
|
||||||
|
|
||||||
# Add a recent +1 which should not be enqueued
|
# Add a recent +1 which should not be enqueued
|
||||||
A.addApproval('verified', 1)
|
A.addApproval('Verified', 1)
|
||||||
self.fake_gerrit.addEvent(comment)
|
self.fake_gerrit.addEvent(comment)
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.assertEqual(len(self.history), 0)
|
self.assertEqual(len(self.history), 0)
|
||||||
|
|
||||||
# Add an old +1 which should be enqueued
|
# 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)
|
granted_on=time.time() - 72 * 60 * 60)
|
||||||
self.fake_gerrit.addEvent(comment)
|
self.fake_gerrit.addEvent(comment)
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
|
@ -116,14 +116,14 @@ class TestRequirementsUserName(ZuulTestCase):
|
||||||
def _test_require_approval_username(self, project, job):
|
def _test_require_approval_username(self, project, job):
|
||||||
A = self.fake_gerrit.addFakeChange(project, 'master', 'A')
|
A = self.fake_gerrit.addFakeChange(project, 'master', 'A')
|
||||||
# A comment event that we will keep submitting to trigger
|
# 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.fake_gerrit.addEvent(comment)
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
# No approval from Jenkins so should not be enqueued
|
# No approval from Jenkins so should not be enqueued
|
||||||
self.assertEqual(len(self.history), 0)
|
self.assertEqual(len(self.history), 0)
|
||||||
|
|
||||||
# Add an approval from Jenkins
|
# Add an approval from Jenkins
|
||||||
A.addApproval('verified', 1, username='jenkins')
|
A.addApproval('Verified', 1, username='jenkins')
|
||||||
self.fake_gerrit.addEvent(comment)
|
self.fake_gerrit.addEvent(comment)
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.assertEqual(len(self.history), 1)
|
self.assertEqual(len(self.history), 1)
|
||||||
|
@ -148,14 +148,14 @@ class TestRequirementsEmail(ZuulTestCase):
|
||||||
def _test_require_approval_email(self, project, job):
|
def _test_require_approval_email(self, project, job):
|
||||||
A = self.fake_gerrit.addFakeChange(project, 'master', 'A')
|
A = self.fake_gerrit.addFakeChange(project, 'master', 'A')
|
||||||
# A comment event that we will keep submitting to trigger
|
# 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.fake_gerrit.addEvent(comment)
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
# No approval from Jenkins so should not be enqueued
|
# No approval from Jenkins so should not be enqueued
|
||||||
self.assertEqual(len(self.history), 0)
|
self.assertEqual(len(self.history), 0)
|
||||||
|
|
||||||
# Add an approval from Jenkins
|
# Add an approval from Jenkins
|
||||||
A.addApproval('verified', 1, username='jenkins')
|
A.addApproval('Verified', 1, username='jenkins')
|
||||||
self.fake_gerrit.addEvent(comment)
|
self.fake_gerrit.addEvent(comment)
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.assertEqual(len(self.history), 1)
|
self.assertEqual(len(self.history), 1)
|
||||||
|
@ -180,20 +180,20 @@ class TestRequirementsVote1(ZuulTestCase):
|
||||||
def _test_require_approval_vote1(self, project, job):
|
def _test_require_approval_vote1(self, project, job):
|
||||||
A = self.fake_gerrit.addFakeChange(project, 'master', 'A')
|
A = self.fake_gerrit.addFakeChange(project, 'master', 'A')
|
||||||
# A comment event that we will keep submitting to trigger
|
# 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.fake_gerrit.addEvent(comment)
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
# No approval from Jenkins so should not be enqueued
|
# No approval from Jenkins so should not be enqueued
|
||||||
self.assertEqual(len(self.history), 0)
|
self.assertEqual(len(self.history), 0)
|
||||||
|
|
||||||
# A -1 from jenkins should not cause it to be enqueued
|
# 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.fake_gerrit.addEvent(comment)
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.assertEqual(len(self.history), 0)
|
self.assertEqual(len(self.history), 0)
|
||||||
|
|
||||||
# A +1 should allow it to be enqueued
|
# 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.fake_gerrit.addEvent(comment)
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.assertEqual(len(self.history), 1)
|
self.assertEqual(len(self.history), 1)
|
||||||
|
@ -218,26 +218,26 @@ class TestRequirementsVote2(ZuulTestCase):
|
||||||
def _test_require_approval_vote2(self, project, job):
|
def _test_require_approval_vote2(self, project, job):
|
||||||
A = self.fake_gerrit.addFakeChange(project, 'master', 'A')
|
A = self.fake_gerrit.addFakeChange(project, 'master', 'A')
|
||||||
# A comment event that we will keep submitting to trigger
|
# 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.fake_gerrit.addEvent(comment)
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
# No approval from Jenkins so should not be enqueued
|
# No approval from Jenkins so should not be enqueued
|
||||||
self.assertEqual(len(self.history), 0)
|
self.assertEqual(len(self.history), 0)
|
||||||
|
|
||||||
# A -1 from jenkins should not cause it to be enqueued
|
# 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.fake_gerrit.addEvent(comment)
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.assertEqual(len(self.history), 0)
|
self.assertEqual(len(self.history), 0)
|
||||||
|
|
||||||
# A -2 from jenkins should not cause it to be enqueued
|
# 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.fake_gerrit.addEvent(comment)
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.assertEqual(len(self.history), 0)
|
self.assertEqual(len(self.history), 0)
|
||||||
|
|
||||||
# A +1 from jenkins should allow it to be enqueued
|
# 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.fake_gerrit.addEvent(comment)
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.assertEqual(len(self.history), 1)
|
self.assertEqual(len(self.history), 1)
|
||||||
|
@ -246,13 +246,13 @@ class TestRequirementsVote2(ZuulTestCase):
|
||||||
# A +2 from nobody should not cause it to be enqueued
|
# A +2 from nobody should not cause it to be enqueued
|
||||||
B = self.fake_gerrit.addFakeChange(project, 'master', 'B')
|
B = self.fake_gerrit.addFakeChange(project, 'master', 'B')
|
||||||
# A comment event that we will keep submitting to trigger
|
# 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.fake_gerrit.addEvent(comment)
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.assertEqual(len(self.history), 1)
|
self.assertEqual(len(self.history), 1)
|
||||||
|
|
||||||
# A +2 from jenkins should allow it to be enqueued
|
# 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.fake_gerrit.addEvent(comment)
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.assertEqual(len(self.history), 2)
|
self.assertEqual(len(self.history), 2)
|
||||||
|
@ -269,10 +269,10 @@ class TestRequirementsState(ZuulTestCase):
|
||||||
# comment on first patchset and check that no additional
|
# comment on first patchset and check that no additional
|
||||||
# jobs are run.
|
# jobs are run.
|
||||||
A = self.fake_gerrit.addFakeChange('current-project', 'master', 'A')
|
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()
|
self.waitUntilSettled()
|
||||||
A.addPatchset()
|
A.addPatchset()
|
||||||
self.fake_gerrit.addEvent(A.addApproval('code-review', 1))
|
self.fake_gerrit.addEvent(A.addApproval('Code-Review', 1))
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
|
|
||||||
self.assertEqual(len(self.history), 2) # one job for each ps
|
self.assertEqual(len(self.history), 2) # one job for each ps
|
||||||
|
@ -290,24 +290,24 @@ class TestRequirementsState(ZuulTestCase):
|
||||||
def test_pipeline_require_open(self):
|
def test_pipeline_require_open(self):
|
||||||
A = self.fake_gerrit.addFakeChange('open-project', 'master', 'A',
|
A = self.fake_gerrit.addFakeChange('open-project', 'master', 'A',
|
||||||
status='MERGED')
|
status='MERGED')
|
||||||
self.fake_gerrit.addEvent(A.addApproval('code-review', 2))
|
self.fake_gerrit.addEvent(A.addApproval('Code-Review', 2))
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.assertEqual(len(self.history), 0)
|
self.assertEqual(len(self.history), 0)
|
||||||
|
|
||||||
B = self.fake_gerrit.addFakeChange('open-project', 'master', 'B')
|
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.waitUntilSettled()
|
||||||
self.assertEqual(len(self.history), 1)
|
self.assertEqual(len(self.history), 1)
|
||||||
|
|
||||||
def test_pipeline_require_status(self):
|
def test_pipeline_require_status(self):
|
||||||
A = self.fake_gerrit.addFakeChange('status-project', 'master', 'A',
|
A = self.fake_gerrit.addFakeChange('status-project', 'master', 'A',
|
||||||
status='MERGED')
|
status='MERGED')
|
||||||
self.fake_gerrit.addEvent(A.addApproval('code-review', 2))
|
self.fake_gerrit.addEvent(A.addApproval('Code-Review', 2))
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.assertEqual(len(self.history), 0)
|
self.assertEqual(len(self.history), 0)
|
||||||
|
|
||||||
B = self.fake_gerrit.addFakeChange('status-project', 'master', 'B')
|
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.waitUntilSettled()
|
||||||
self.assertEqual(len(self.history), 1)
|
self.assertEqual(len(self.history), 1)
|
||||||
|
|
||||||
|
@ -326,21 +326,21 @@ class TestRequirementsRejectUsername(ZuulTestCase):
|
||||||
self.assertEqual(len(self.history), 0)
|
self.assertEqual(len(self.history), 0)
|
||||||
|
|
||||||
# add in a comment that will trigger
|
# 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'))
|
username='reviewer'))
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.assertEqual(len(self.history), 1)
|
self.assertEqual(len(self.history), 1)
|
||||||
self.assertEqual(self.history[0].name, job)
|
self.assertEqual(self.history[0].name, job)
|
||||||
|
|
||||||
# add in a comment from jenkins user which shouldn't trigger
|
# 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'))
|
username='jenkins'))
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.assertEqual(len(self.history), 1)
|
self.assertEqual(len(self.history), 1)
|
||||||
|
|
||||||
# Check future reviews also won't trigger as a 'jenkins' user has
|
# Check future reviews also won't trigger as a 'jenkins' user has
|
||||||
# commented previously
|
# commented previously
|
||||||
self.fake_gerrit.addEvent(A.addApproval('code-review', 1,
|
self.fake_gerrit.addEvent(A.addApproval('Code-Review', 1,
|
||||||
username='reviewer'))
|
username='reviewer'))
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.assertEqual(len(self.history), 1)
|
self.assertEqual(len(self.history), 1)
|
||||||
|
@ -368,39 +368,39 @@ class TestRequirementsReject(ZuulTestCase):
|
||||||
self.assertEqual(len(self.history), 0)
|
self.assertEqual(len(self.history), 0)
|
||||||
|
|
||||||
# First positive vote should not queue until jenkins has +1'd
|
# 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.fake_gerrit.addEvent(comment)
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.assertEqual(len(self.history), 0)
|
self.assertEqual(len(self.history), 0)
|
||||||
|
|
||||||
# Jenkins should put in a +1 which will also queue
|
# 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.fake_gerrit.addEvent(comment)
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.assertEqual(len(self.history), 1)
|
self.assertEqual(len(self.history), 1)
|
||||||
self.assertEqual(self.history[0].name, job)
|
self.assertEqual(self.history[0].name, job)
|
||||||
|
|
||||||
# Negative vote should not queue
|
# 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.fake_gerrit.addEvent(comment)
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.assertEqual(len(self.history), 1)
|
self.assertEqual(len(self.history), 1)
|
||||||
|
|
||||||
# Future approvals should do nothing
|
# 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.fake_gerrit.addEvent(comment)
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.assertEqual(len(self.history), 1)
|
self.assertEqual(len(self.history), 1)
|
||||||
|
|
||||||
# Change/update negative vote should queue
|
# 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.fake_gerrit.addEvent(comment)
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.assertEqual(len(self.history), 2)
|
self.assertEqual(len(self.history), 2)
|
||||||
self.assertEqual(self.history[1].name, job)
|
self.assertEqual(self.history[1].name, job)
|
||||||
|
|
||||||
# Future approvals should also queue
|
# 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.fake_gerrit.addEvent(comment)
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.assertEqual(len(self.history), 3)
|
self.assertEqual(len(self.history), 3)
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -31,8 +31,8 @@ class TestMultipleTenants(AnsibleZuulTestCase):
|
||||||
|
|
||||||
def test_multiple_tenants(self):
|
def test_multiple_tenants(self):
|
||||||
A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
|
A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
|
||||||
A.addApproval('code-review', 2)
|
A.addApproval('Code-Review', 2)
|
||||||
self.fake_gerrit.addEvent(A.addApproval('approved', 1))
|
self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.assertEqual(self.getJobFromHistory('project1-test1').result,
|
self.assertEqual(self.getJobFromHistory('project1-test1').result,
|
||||||
'SUCCESS')
|
'SUCCESS')
|
||||||
|
@ -47,8 +47,8 @@ class TestMultipleTenants(AnsibleZuulTestCase):
|
||||||
"A should *not* transit tenant-two gate")
|
"A should *not* transit tenant-two gate")
|
||||||
|
|
||||||
B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B')
|
B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B')
|
||||||
B.addApproval('code-review', 2)
|
B.addApproval('Code-Review', 2)
|
||||||
self.fake_gerrit.addEvent(B.addApproval('approved', 1))
|
self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.assertEqual(self.getJobFromHistory('python27',
|
self.assertEqual(self.getJobFromHistory('python27',
|
||||||
'org/project2').result,
|
'org/project2').result,
|
||||||
|
@ -74,8 +74,8 @@ class TestInRepoConfig(ZuulTestCase):
|
||||||
|
|
||||||
def test_in_repo_config(self):
|
def test_in_repo_config(self):
|
||||||
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
|
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
|
||||||
A.addApproval('code-review', 2)
|
A.addApproval('Code-Review', 2)
|
||||||
self.fake_gerrit.addEvent(A.addApproval('approved', 1))
|
self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.assertEqual(self.getJobFromHistory('project-test1').result,
|
self.assertEqual(self.getJobFromHistory('project-test1').result,
|
||||||
'SUCCESS')
|
'SUCCESS')
|
||||||
|
@ -108,8 +108,8 @@ class TestInRepoConfig(ZuulTestCase):
|
||||||
'playbooks/project-test2.yaml': in_repo_playbook}
|
'playbooks/project-test2.yaml': in_repo_playbook}
|
||||||
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A',
|
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A',
|
||||||
files=file_dict)
|
files=file_dict)
|
||||||
A.addApproval('code-review', 2)
|
A.addApproval('Code-Review', 2)
|
||||||
self.fake_gerrit.addEvent(A.addApproval('approved', 1))
|
self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.assertEqual(A.data['status'], 'MERGED')
|
self.assertEqual(A.data['status'], 'MERGED')
|
||||||
self.assertEqual(A.reported, 2,
|
self.assertEqual(A.reported, 2,
|
||||||
|
@ -125,8 +125,8 @@ class TestInRepoConfig(ZuulTestCase):
|
||||||
# Now that the config change is landed, it should be live for
|
# Now that the config change is landed, it should be live for
|
||||||
# subsequent changes.
|
# subsequent changes.
|
||||||
B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
|
B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
|
||||||
B.addApproval('code-review', 2)
|
B.addApproval('Code-Review', 2)
|
||||||
self.fake_gerrit.addEvent(B.addApproval('approved', 1))
|
self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.assertEqual(self.getJobFromHistory('project-test2').result,
|
self.assertEqual(self.getJobFromHistory('project-test2').result,
|
||||||
'SUCCESS')
|
'SUCCESS')
|
||||||
|
@ -229,8 +229,8 @@ class TestInRepoConfig(ZuulTestCase):
|
||||||
'playbooks/project-test2.yaml': in_repo_playbook}
|
'playbooks/project-test2.yaml': in_repo_playbook}
|
||||||
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A',
|
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A',
|
||||||
files=file_dict)
|
files=file_dict)
|
||||||
A.addApproval('approved', 1)
|
A.addApproval('Approved', 1)
|
||||||
self.fake_gerrit.addEvent(A.addApproval('code-review', 2))
|
self.fake_gerrit.addEvent(A.addApproval('Code-Review', 2))
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
|
|
||||||
items = gate_pipeline.getAllItems()
|
items = gate_pipeline.getAllItems()
|
||||||
|
@ -269,8 +269,8 @@ class TestInRepoConfig(ZuulTestCase):
|
||||||
self.create_branch('org/project', 'stable')
|
self.create_branch('org/project', 'stable')
|
||||||
A = self.fake_gerrit.addFakeChange('org/project', 'stable', 'A',
|
A = self.fake_gerrit.addFakeChange('org/project', 'stable', 'A',
|
||||||
files=file_dict)
|
files=file_dict)
|
||||||
A.addApproval('code-review', 2)
|
A.addApproval('Code-Review', 2)
|
||||||
self.fake_gerrit.addEvent(A.addApproval('approved', 1))
|
self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.assertEqual(A.data['status'], 'MERGED')
|
self.assertEqual(A.data['status'], 'MERGED')
|
||||||
self.assertEqual(A.reported, 2,
|
self.assertEqual(A.reported, 2,
|
||||||
|
@ -284,8 +284,8 @@ class TestInRepoConfig(ZuulTestCase):
|
||||||
|
|
||||||
# The config change should not affect master.
|
# The config change should not affect master.
|
||||||
B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
|
B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
|
||||||
B.addApproval('code-review', 2)
|
B.addApproval('Code-Review', 2)
|
||||||
self.fake_gerrit.addEvent(B.addApproval('approved', 1))
|
self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.assertHistory([
|
self.assertHistory([
|
||||||
dict(name='project-test2', result='SUCCESS', changes='1,1'),
|
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
|
# The config change should be live for further changes on
|
||||||
# stable.
|
# stable.
|
||||||
C = self.fake_gerrit.addFakeChange('org/project', 'stable', 'C')
|
C = self.fake_gerrit.addFakeChange('org/project', 'stable', 'C')
|
||||||
C.addApproval('code-review', 2)
|
C.addApproval('Code-Review', 2)
|
||||||
self.fake_gerrit.addEvent(C.addApproval('approved', 1))
|
self.fake_gerrit.addEvent(C.addApproval('Approved', 1))
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.assertHistory([
|
self.assertHistory([
|
||||||
dict(name='project-test2', result='SUCCESS', changes='1,1'),
|
dict(name='project-test2', result='SUCCESS', changes='1,1'),
|
||||||
|
@ -368,8 +368,8 @@ class TestInRepoConfig(ZuulTestCase):
|
||||||
file_dict = {'.zuul.yaml': in_repo_conf}
|
file_dict = {'.zuul.yaml': in_repo_conf}
|
||||||
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A',
|
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A',
|
||||||
files=file_dict)
|
files=file_dict)
|
||||||
A.addApproval('code-review', 2)
|
A.addApproval('Code-Review', 2)
|
||||||
self.fake_gerrit.addEvent(A.addApproval('approved', 1))
|
self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
|
|
||||||
self.assertEqual(A.data['status'], 'NEW')
|
self.assertEqual(A.data['status'], 'NEW')
|
||||||
|
@ -389,8 +389,8 @@ class TestInRepoConfig(ZuulTestCase):
|
||||||
file_dict = {'zuul.yaml': in_repo_conf}
|
file_dict = {'zuul.yaml': in_repo_conf}
|
||||||
A = self.fake_gerrit.addFakeChange('common-config', 'master', 'A',
|
A = self.fake_gerrit.addFakeChange('common-config', 'master', 'A',
|
||||||
files=file_dict)
|
files=file_dict)
|
||||||
A.addApproval('code-review', 2)
|
A.addApproval('Code-Review', 2)
|
||||||
self.fake_gerrit.addEvent(A.addApproval('approved', 1))
|
self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
|
|
||||||
self.assertEqual(A.data['status'], 'NEW')
|
self.assertEqual(A.data['status'], 'NEW')
|
||||||
|
@ -409,8 +409,8 @@ class TestInRepoConfig(ZuulTestCase):
|
||||||
file_dict = {'.zuul.yaml': in_repo_conf}
|
file_dict = {'.zuul.yaml': in_repo_conf}
|
||||||
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A',
|
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A',
|
||||||
files=file_dict)
|
files=file_dict)
|
||||||
A.addApproval('code-review', 2)
|
A.addApproval('Code-Review', 2)
|
||||||
self.fake_gerrit.addEvent(A.addApproval('approved', 1))
|
self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
|
|
||||||
self.assertEqual(A.data['status'], 'NEW')
|
self.assertEqual(A.data['status'], 'NEW')
|
||||||
|
@ -429,8 +429,8 @@ class TestInRepoConfig(ZuulTestCase):
|
||||||
file_dict = {'.zuul.yaml': in_repo_conf}
|
file_dict = {'.zuul.yaml': in_repo_conf}
|
||||||
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A',
|
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A',
|
||||||
files=file_dict)
|
files=file_dict)
|
||||||
A.addApproval('code-review', 2)
|
A.addApproval('Code-Review', 2)
|
||||||
self.fake_gerrit.addEvent(A.addApproval('approved', 1))
|
self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
|
|
||||||
self.assertEqual(A.data['status'], 'NEW')
|
self.assertEqual(A.data['status'], 'NEW')
|
||||||
|
@ -449,8 +449,8 @@ class TestInRepoConfig(ZuulTestCase):
|
||||||
file_dict = {'.zuul.yaml': in_repo_conf}
|
file_dict = {'.zuul.yaml': in_repo_conf}
|
||||||
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A',
|
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A',
|
||||||
files=file_dict)
|
files=file_dict)
|
||||||
A.addApproval('code-review', 2)
|
A.addApproval('Code-Review', 2)
|
||||||
self.fake_gerrit.addEvent(A.addApproval('approved', 1))
|
self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
|
|
||||||
self.assertEqual(A.data['status'], 'NEW')
|
self.assertEqual(A.data['status'], 'NEW')
|
||||||
|
@ -469,8 +469,8 @@ class TestInRepoConfig(ZuulTestCase):
|
||||||
file_dict = {'.zuul.yaml': in_repo_conf}
|
file_dict = {'.zuul.yaml': in_repo_conf}
|
||||||
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A',
|
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A',
|
||||||
files=file_dict)
|
files=file_dict)
|
||||||
A.addApproval('code-review', 2)
|
A.addApproval('Code-Review', 2)
|
||||||
self.fake_gerrit.addEvent(A.addApproval('approved', 1))
|
self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
|
|
||||||
self.assertEqual(A.data['status'], 'NEW')
|
self.assertEqual(A.data['status'], 'NEW')
|
||||||
|
@ -494,8 +494,8 @@ class TestInRepoConfig(ZuulTestCase):
|
||||||
file_dict = {'.zuul.yaml': in_repo_conf}
|
file_dict = {'.zuul.yaml': in_repo_conf}
|
||||||
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A',
|
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A',
|
||||||
files=file_dict)
|
files=file_dict)
|
||||||
A.addApproval('code-review', 2)
|
A.addApproval('Code-Review', 2)
|
||||||
self.fake_gerrit.addEvent(A.addApproval('approved', 1))
|
self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
|
|
||||||
self.assertEqual(A.data['status'], 'NEW')
|
self.assertEqual(A.data['status'], 'NEW')
|
||||||
|
@ -522,8 +522,8 @@ class TestInRepoConfig(ZuulTestCase):
|
||||||
file_dict = {'.zuul.yaml': in_repo_conf}
|
file_dict = {'.zuul.yaml': in_repo_conf}
|
||||||
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A',
|
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A',
|
||||||
files=file_dict)
|
files=file_dict)
|
||||||
A.addApproval('code-review', 2)
|
A.addApproval('Code-Review', 2)
|
||||||
self.fake_gerrit.addEvent(A.addApproval('approved', 1))
|
self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
|
|
||||||
self.assertEqual(A.data['status'], 'NEW')
|
self.assertEqual(A.data['status'], 'NEW')
|
||||||
|
@ -549,8 +549,8 @@ class TestInRepoConfig(ZuulTestCase):
|
||||||
file_dict = {'.zuul.yaml': downstream_repo_conf}
|
file_dict = {'.zuul.yaml': downstream_repo_conf}
|
||||||
A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A',
|
A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A',
|
||||||
files=file_dict)
|
files=file_dict)
|
||||||
A.addApproval('code-review', 2)
|
A.addApproval('Code-Review', 2)
|
||||||
self.fake_gerrit.addEvent(A.addApproval('approved', 1))
|
self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
|
|
||||||
self.assertEqual(A.data['status'], 'MERGED')
|
self.assertEqual(A.data['status'], 'MERGED')
|
||||||
|
@ -575,8 +575,8 @@ class TestInRepoConfig(ZuulTestCase):
|
||||||
file_dict = {'.zuul.yaml': upstream_repo_conf}
|
file_dict = {'.zuul.yaml': upstream_repo_conf}
|
||||||
B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B',
|
B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B',
|
||||||
files=file_dict)
|
files=file_dict)
|
||||||
B.addApproval('code-review', 2)
|
B.addApproval('Code-Review', 2)
|
||||||
self.fake_gerrit.addEvent(B.addApproval('approved', 1))
|
self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
|
|
||||||
self.assertEqual(B.data['status'], 'MERGED')
|
self.assertEqual(B.data['status'], 'MERGED')
|
||||||
|
|
|
@ -31,11 +31,11 @@ class TestWebapp(ZuulTestCase):
|
||||||
super(TestWebapp, self).setUp()
|
super(TestWebapp, self).setUp()
|
||||||
self.executor_server.hold_jobs_in_build = True
|
self.executor_server.hold_jobs_in_build = True
|
||||||
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
|
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
|
||||||
A.addApproval('code-review', 2)
|
A.addApproval('Code-Review', 2)
|
||||||
self.fake_gerrit.addEvent(A.addApproval('approved', 1))
|
self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
|
||||||
B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B')
|
B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B')
|
||||||
B.addApproval('code-review', 2)
|
B.addApproval('Code-Review', 2)
|
||||||
self.fake_gerrit.addEvent(B.addApproval('approved', 1))
|
self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
self.port = self.webapp.server.socket.getsockname()[1]
|
self.port = self.webapp.server.socket.getsockname()[1]
|
||||||
|
|
||||||
|
|
|
@ -31,17 +31,17 @@ class TestZuulTriggerParentChangeEnqueued(ZuulTestCase):
|
||||||
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
|
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
|
||||||
B1 = self.fake_gerrit.addFakeChange('org/project', 'master', 'B1')
|
B1 = self.fake_gerrit.addFakeChange('org/project', 'master', 'B1')
|
||||||
B2 = self.fake_gerrit.addFakeChange('org/project', 'master', 'B2')
|
B2 = self.fake_gerrit.addFakeChange('org/project', 'master', 'B2')
|
||||||
A.addApproval('code-review', 2)
|
A.addApproval('Code-Review', 2)
|
||||||
B1.addApproval('code-review', 2)
|
B1.addApproval('Code-Review', 2)
|
||||||
B2.addApproval('code-review', 2)
|
B2.addApproval('Code-Review', 2)
|
||||||
A.addApproval('verified', 1) # required by gate
|
A.addApproval('Verified', 1) # required by gate
|
||||||
B1.addApproval('verified', -1) # should go to check
|
B1.addApproval('Verified', -1) # should go to check
|
||||||
B2.addApproval('verified', 1) # should go to gate
|
B2.addApproval('Verified', 1) # should go to gate
|
||||||
B1.addApproval('approved', 1)
|
B1.addApproval('Approved', 1)
|
||||||
B2.addApproval('approved', 1)
|
B2.addApproval('Approved', 1)
|
||||||
B1.setDependsOn(A, 1)
|
B1.setDependsOn(A, 1)
|
||||||
B2.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
|
# 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
|
# to enqueue behind 1,1 so that the test is more
|
||||||
# deterministic.
|
# deterministic.
|
||||||
|
@ -85,8 +85,8 @@ class TestZuulTriggerProjectChangeMerged(ZuulTestCase):
|
||||||
B.addPatchset({'conflict': 'bar'})
|
B.addPatchset({'conflict': 'bar'})
|
||||||
D.addPatchset({'conflict2': 'foo'})
|
D.addPatchset({'conflict2': 'foo'})
|
||||||
E.addPatchset({'conflict2': 'bar'})
|
E.addPatchset({'conflict2': 'bar'})
|
||||||
A.addApproval('code-review', 2)
|
A.addApproval('Code-Review', 2)
|
||||||
self.fake_gerrit.addEvent(A.addApproval('approved', 1))
|
self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
|
|
||||||
self.assertEqual(len(self.history), 1)
|
self.assertEqual(len(self.history), 1)
|
||||||
|
@ -112,8 +112,8 @@ class TestZuulTriggerProjectChangeMerged(ZuulTestCase):
|
||||||
# configuration.
|
# configuration.
|
||||||
self.sched.reconfigure(self.config)
|
self.sched.reconfigure(self.config)
|
||||||
|
|
||||||
D.addApproval('code-review', 2)
|
D.addApproval('Code-Review', 2)
|
||||||
self.fake_gerrit.addEvent(D.addApproval('approved', 1))
|
self.fake_gerrit.addEvent(D.addApproval('Approved', 1))
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
|
|
||||||
self.assertEqual(len(self.history), 2)
|
self.assertEqual(len(self.history), 2)
|
||||||
|
|
Loading…
Reference in New Issue