Merge "Wait for merger to complete before item is ready" into feature/zuulv3
This commit is contained in:
commit
801fe15263
|
@ -1789,8 +1789,6 @@ class ZuulTestCase(BaseTestCase):
|
|||
old_urlopen = urllib.request.urlopen
|
||||
urllib.request.urlopen = URLOpenerFactory
|
||||
|
||||
self._startMerger()
|
||||
|
||||
self.executor_server = RecordingExecutorServer(
|
||||
self.config, self.connections,
|
||||
jobdir_root=self.test_root,
|
||||
|
@ -2066,8 +2064,6 @@ class ZuulTestCase(BaseTestCase):
|
|||
def shutdown(self):
|
||||
self.log.debug("Shutting down after tests")
|
||||
self.executor_client.stop()
|
||||
self.merge_server.stop()
|
||||
self.merge_server.join()
|
||||
self.merge_client.stop()
|
||||
self.executor_server.stop()
|
||||
self.sched.stop()
|
||||
|
|
|
@ -1012,6 +1012,7 @@ class TestScheduler(ZuulTestCase):
|
|||
self.fake_gerrit.addEvent(A.addApproval('approved', 1))
|
||||
self.waitUntilSettled()
|
||||
self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
|
||||
self.waitUntilSettled()
|
||||
self.fake_gerrit.addEvent(C.getPatchsetCreatedEvent(1))
|
||||
self.waitUntilSettled()
|
||||
|
||||
|
@ -1509,7 +1510,7 @@ class TestScheduler(ZuulTestCase):
|
|||
tenant = self.sched.abide.tenants.get('tenant-one')
|
||||
trusted, project = tenant.getProject('org/project')
|
||||
url = self.fake_gerrit.getGitUrl(project)
|
||||
self.merge_server.merger._addProject('review.example.com',
|
||||
self.executor_server.merger._addProject('review.example.com',
|
||||
'org/project', url)
|
||||
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
|
||||
A.addPatchset(large=True)
|
||||
|
|
|
@ -522,6 +522,10 @@ class PipelineManager(object):
|
|||
build_set.setConfiguration()
|
||||
if build_set.merge_state == build_set.NEW:
|
||||
return self.scheduleMerge(item, ['zuul.yaml', '.zuul.yaml'])
|
||||
if build_set.merge_state == build_set.PENDING:
|
||||
return False
|
||||
if build_set.unable_to_merge:
|
||||
return False
|
||||
if build_set.config_error:
|
||||
return False
|
||||
return True
|
||||
|
|
Loading…
Reference in New Issue