zuul/zuul
Code Issues Proposed changes

Merge "Remove org_unknown git repo from single-client test config" into feature/zuulv3

Browse Source
This commit is contained in:
Jenkins
2017-04-21 14:39:53 +00:00
committed by Gerrit Code Review
parent 9c9fd530c0 c4ba97ac6b
commit 6f020f4ec3
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/base.py
View File

@@ -1659,7 +1659,7 @@ class ZuulTestCase(BaseTestCase):
def assertCleanShutdown(self):
pass
def init_repo(self, project):
def init_repo(self, project, tag=None):
parts = project.split('/')
path = os.path.join(self.upstream_root, *parts[:-1])
if not os.path.exists(path):
@@ -1673,6 +1673,8 @@ class ZuulTestCase(BaseTestCase):
repo.index.commit('initial commit')
master = repo.create_head('master')
if tag:
repo.create_tag(tag)
repo.head.reference = master
zuul.merger.merger.reset_repo_to_head(repo)

1
tests/fixtures/config/single-tenant/git/org_unknown/README vendored
View File

@@ -1 +0,0 @@
test

6
tests/unit/test_scheduler.py
View File

@@ -4055,7 +4055,7 @@ For CI problems and help debugging, contact ci@example.org"""
def test_crd_gate_unknown(self):
"Test unknown projects in dependent pipeline"
self.init_repo("org/unknown")
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)
@@ -4269,7 +4269,7 @@ For CI problems and help debugging, contact ci@example.org"""
independent pipelines"""
# It's a hack for fake gerrit,
# as it implies repo creation upon the creation of any change
self.init_repo("org/unknown")
self.init_repo("org/unknown", tag='init')
self._test_crd_check_reconfiguration('org/project1', 'org/unknown')
@simple_layout('layouts/ignore-dependencies.yaml')
@@ -4358,7 +4358,7 @@ For CI problems and help debugging, contact ci@example.org"""
def test_crd_check_unknown(self):
"Test unknown projects in independent pipeline"
self.init_repo("org/unknown")
self.init_repo("org/unknown", tag='init')
A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
B = self.fake_gerrit.addFakeChange('org/unknown', 'master', 'D')
# A Depends-On: B