1c2c3c2629
The merge failure message is the same whether your change failed to merge or it was one of its dependencies, including cross-repo dependencies. Update the default error message for this to mention the latter possibility so that contributors don't unnecessarily rebase a dependent change which doesn't actually need it. Change-Id: Ia17d9ab2a842574cf684b4ebb955dd2ec6e9ec3d
143 lines
6.0 KiB
Python
143 lines
6.0 KiB
Python
#!/usr/bin/env python
|
|
|
|
# Copyright 2014 Hewlett-Packard Development Company, L.P.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import logging
|
|
|
|
from tests.base import ZuulTestCase
|
|
|
|
logging.basicConfig(level=logging.DEBUG,
|
|
format='%(asctime)s %(name)-32s '
|
|
'%(levelname)-8s %(message)s')
|
|
|
|
|
|
class TestZuulTrigger(ZuulTestCase):
|
|
"""Test Zuul Trigger"""
|
|
|
|
def test_zuul_trigger_parent_change_enqueued(self):
|
|
"Test Zuul trigger event: parent-change-enqueued"
|
|
self.config.set('zuul', 'layout_config',
|
|
'tests/fixtures/layout-zuultrigger-enqueued.yaml')
|
|
self.sched.reconfigure(self.config)
|
|
self.registerJobs()
|
|
|
|
# This test has the following three changes:
|
|
# B1 -> A; B2 -> A
|
|
# When A is enqueued in the gate, B1 and B2 should both attempt
|
|
# to be enqueued in both pipelines. B1 should end up in check
|
|
# and B2 in gate because of differing pipeline requirements.
|
|
self.worker.hold_jobs_in_build = True
|
|
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('CRVW', 2)
|
|
B1.addApproval('CRVW', 2)
|
|
B2.addApproval('CRVW', 2)
|
|
A.addApproval('VRFY', 1) # required by gate
|
|
B1.addApproval('VRFY', -1) # should go to check
|
|
B2.addApproval('VRFY', 1) # should go to gate
|
|
B1.addApproval('APRV', 1)
|
|
B2.addApproval('APRV', 1)
|
|
B1.setDependsOn(A, 1)
|
|
B2.setDependsOn(A, 1)
|
|
self.fake_gerrit.addEvent(A.addApproval('APRV', 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.
|
|
self.waitUntilSettled()
|
|
self.worker.hold_jobs_in_build = False
|
|
self.worker.release()
|
|
self.waitUntilSettled()
|
|
|
|
self.assertEqual(len(self.history), 3)
|
|
for job in self.history:
|
|
if job.changes == '1,1':
|
|
self.assertEqual(job.name, 'project-gate')
|
|
elif job.changes == '1,1 2,1':
|
|
self.assertEqual(job.name, 'project-check')
|
|
elif job.changes == '1,1 3,1':
|
|
self.assertEqual(job.name, 'project-gate')
|
|
else:
|
|
raise Exception("Unknown job")
|
|
|
|
def test_zuul_trigger_project_change_merged(self):
|
|
"Test Zuul trigger event: project-change-merged"
|
|
self.config.set('zuul', 'layout_config',
|
|
'tests/fixtures/layout-zuultrigger-merged.yaml')
|
|
self.sched.reconfigure(self.config)
|
|
self.registerJobs()
|
|
|
|
# This test has the following three changes:
|
|
# A, B, C; B conflicts with A, but C does not.
|
|
# When A is merged, B and C should be checked for conflicts,
|
|
# and B should receive a -1.
|
|
# D and E are used to repeat the test in the second part, but
|
|
# are defined here to that they end up in the trigger cache.
|
|
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')
|
|
D = self.fake_gerrit.addFakeChange('org/project', 'master', 'D')
|
|
E = self.fake_gerrit.addFakeChange('org/project', 'master', 'E')
|
|
A.addPatchset(['conflict'])
|
|
B.addPatchset(['conflict'])
|
|
D.addPatchset(['conflict2'])
|
|
E.addPatchset(['conflict2'])
|
|
A.addApproval('CRVW', 2)
|
|
self.fake_gerrit.addEvent(A.addApproval('APRV', 1))
|
|
self.waitUntilSettled()
|
|
|
|
self.assertEqual(len(self.history), 1)
|
|
self.assertEqual(self.history[0].name, 'project-gate')
|
|
self.assertEqual(A.reported, 2)
|
|
self.assertEqual(B.reported, 1)
|
|
self.assertEqual(C.reported, 0)
|
|
self.assertEqual(D.reported, 0)
|
|
self.assertEqual(E.reported, 0)
|
|
self.assertEqual(
|
|
B.messages[0],
|
|
"Merge Failed.\n\nThis change or one of its cross-repo "
|
|
"dependencies was unable to be automatically merged with the "
|
|
"current state of its repository. Please rebase the change and "
|
|
"upload a new patchset.")
|
|
|
|
self.assertTrue("project:org/project status:open" in
|
|
self.fake_gerrit.queries)
|
|
|
|
# Reconfigure and run the test again. This is a regression
|
|
# check to make sure that we don't end up with a stale trigger
|
|
# cache that has references to projects from the old
|
|
# configuration.
|
|
self.sched.reconfigure(self.config)
|
|
|
|
D.addApproval('CRVW', 2)
|
|
self.fake_gerrit.addEvent(D.addApproval('APRV', 1))
|
|
self.waitUntilSettled()
|
|
|
|
self.assertEqual(len(self.history), 2)
|
|
self.assertEqual(self.history[1].name, 'project-gate')
|
|
self.assertEqual(A.reported, 2)
|
|
self.assertEqual(B.reported, 1)
|
|
self.assertEqual(C.reported, 0)
|
|
self.assertEqual(D.reported, 2)
|
|
self.assertEqual(E.reported, 1)
|
|
self.assertEqual(
|
|
E.messages[0],
|
|
"Merge Failed.\n\nThis change or one of its cross-repo "
|
|
"dependencies was unable to be automatically merged with the "
|
|
"current state of its repository. Please rebase the change and "
|
|
"upload a new patchset.")
|
|
self.assertEqual(self.fake_gerrit.queries[1],
|
|
"project:org/project status:open")
|