zuul
/
zuul
Code Issues Proposed changes

Merge "Re-enable requirement status tests" into feature/zuulv3

This commit is contained in:
Jenkins 2016-12-11 23:30:24 +00:00 committed by Gerrit Code Review
parent 11ce5a0338 d62939fcbe
commit dc2ee85265
9 changed files with 103 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
tests/fixtures/config/requirements/state/git/common-config/zuul.yaml vendored Normal file
View File

@ -0,0 +1,74 @@
- pipeline:
name: current-check
manager: independent
source:
gerrit
require:
current-patchset: True
trigger:
gerrit:
- event: patchset-created
- event: comment-added
success:
gerrit:
verified: 1
failure:
gerrit:
verified: -1
- pipeline:
name: open-check
manager: independent
source:
gerrit
require:
open: True
trigger:
gerrit:
- event: patchset-created
- event: comment-added
success:
gerrit:
verified: 1
failure:
gerrit:
verified: -1
- pipeline:
name: status-check
manager: independent
source:
gerrit
require:
status: NEW
trigger:
gerrit:
- event: patchset-created
- event: comment-added
success:
gerrit:
verified: 1
failure:
gerrit:
verified: -1
- job:
name: project-job
- project:
name: current-project
current-check:
jobs:
- project-job
- project:
name: open-project
open-check:
jobs:
- project-job
- project:
name: status-project
status-check:
jobs:
- project-job

1
tests/fixtures/config/requirements/state/git/current-project/README vendored Normal file
View File

@ -0,0 +1 @@
test

1
tests/fixtures/config/requirements/state/git/open-project/README vendored Normal file
View File

@ -0,0 +1 @@
test

1
tests/fixtures/config/requirements/state/git/status-project/README vendored Normal file
View File

@ -0,0 +1 @@
test

6
tests/fixtures/config/requirements/state/main.yaml vendored Normal file
View File

@ -0,0 +1,6 @@
- tenant:
name: tenant-one
source:
gerrit:
config-repos:
- common-config

20
tests/fixtures/layout-requirement-current-patchset.yaml vendored
View File

@ -1,20 +0,0 @@
pipelines:
- name: check
manager: IndependentPipelineManager
require:
current-patchset: True
trigger:
gerrit:
- event: patchset-created
- event: comment-added
success:
gerrit:
verified: 1
failure:
gerrit:
verified: -1
projects:
- name: org/project
check:
- project-check

20
tests/fixtures/layout-requirement-open.yaml vendored
View File

@ -1,20 +0,0 @@
pipelines:
- name: check
manager: IndependentPipelineManager
require:
open: True
trigger:
gerrit:
- event: patchset-created
- event: comment-added
success:
gerrit:
verified: 1
failure:
gerrit:
verified: -1
projects:
- name: org/project
check:
- project-check

20
tests/fixtures/layout-requirement-status.yaml vendored
View File

@ -1,20 +0,0 @@
pipelines:
- name: check
manager: IndependentPipelineManager
require:
status: NEW
trigger:
gerrit:
- event: patchset-created
- event: comment-added
success:
gerrit:
verified: 1
failure:
gerrit:
verified: -1
projects:
- name: org/project
check:
- project-check

54
tests/test_requirements.py
View File

@ -264,26 +264,20 @@ class TestRequirementsVote2(ZuulTestCase):
self.assertEqual(self.history[1].name, job)
class TestRequirements(ZuulTestCase):
"""Test pipeline and trigger requirements"""
class TestRequirementsState(ZuulTestCase):
"""Requirements with simple state requirement"""
tenant_config_file = 'config/requirements/main.yaml'
tenant_config_file = 'config/requirements/state/main.yaml'
@skip("Disabled for early v3 development")
def test_pipeline_require_current_patchset(self):
"Test pipeline requirement: current-patchset"
self.updateConfigLayout(
'tests/fixtures/layout-requirement-current-patchset.yaml')
self.sched.reconfigure(self.config)
self.registerJobs()
# Create two patchsets and let their tests settle out. Then
# comment on first patchset and check that no additional
# jobs are run.
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
self.fake_gerrit.addEvent(A.addApproval('CRVW', 1))
A = self.fake_gerrit.addFakeChange('current-project', 'master', 'A')
self.fake_gerrit.addEvent(A.addApproval('code-review', 1))
self.waitUntilSettled()
A.addPatchset()
self.fake_gerrit.addEvent(A.addApproval('CRVW', 1))
self.fake_gerrit.addEvent(A.addApproval('code-review', 1))
self.waitUntilSettled()
self.assertEqual(len(self.history), 2) # one job for each ps
@ -298,44 +292,36 @@ class TestRequirements(ZuulTestCase):
self.waitUntilSettled()
self.assertEqual(len(self.history), 3)
@skip("Disabled for early v3 development")
def test_pipeline_require_open(self):
"Test pipeline requirement: open"
self.updateConfigLayout(
'tests/fixtures/layout-requirement-open.yaml')
self.sched.reconfigure(self.config)
self.registerJobs()
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A',
A = self.fake_gerrit.addFakeChange('open-project', 'master', 'A',
status='MERGED')
self.fake_gerrit.addEvent(A.addApproval('CRVW', 2))
self.fake_gerrit.addEvent(A.addApproval('code-review', 2))
self.waitUntilSettled()
self.assertEqual(len(self.history), 0)
B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
self.fake_gerrit.addEvent(B.addApproval('CRVW', 2))
B = self.fake_gerrit.addFakeChange('open-project', 'master', 'B')
self.fake_gerrit.addEvent(B.addApproval('code-review', 2))
self.waitUntilSettled()
self.assertEqual(len(self.history), 1)
@skip("Disabled for early v3 development")
def test_pipeline_require_status(self):
"Test pipeline requirement: status"
self.updateConfigLayout(
'tests/fixtures/layout-requirement-status.yaml')
self.sched.reconfigure(self.config)
self.registerJobs()
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A',
A = self.fake_gerrit.addFakeChange('status-project', 'master', 'A',
status='MERGED')
self.fake_gerrit.addEvent(A.addApproval('CRVW', 2))
self.fake_gerrit.addEvent(A.addApproval('code-review', 2))
self.waitUntilSettled()
self.assertEqual(len(self.history), 0)
B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
self.fake_gerrit.addEvent(B.addApproval('CRVW', 2))
B = self.fake_gerrit.addFakeChange('status-project', 'master', 'B')
self.fake_gerrit.addEvent(B.addApproval('code-review', 2))
self.waitUntilSettled()
self.assertEqual(len(self.history), 1)
class TestRequirements(ZuulTestCase):
"""Test pipeline and trigger requirements"""
tenant_config_file = 'config/requirements/main.yaml'
def _test_require_reject_username(self, project, job):
"Test negative username's match"
# Should only trigger if Jenkins hasn't voted.