zuul
/
zuul
Code Issues Proposed changes

Re-enable test_zuul_trigger_project_change_merged 

It looks like this now just works (with a minor main.yaml fix). Thus
reenable this test to ensure a merge-check pipeline keeps working.

Change-Id: Id788d4979aa70b45773cededa9ac2a025246b259
This commit is contained in:
Tobias Henkel 2017-10-19 07:47:16 +02:00
parent 8fe53b4441
commit 3ea845fd25
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/fixtures/config/zuultrigger/project-change-merged/main.yaml vendored
View File

@ -4,3 +4,5 @@
gerrit:
config-projects:
- common-config
untrusted-projects:
- org/project

3
tests/unit/test_zuultrigger.py
View File

@ -64,9 +64,6 @@ class TestZuulTriggerParentChangeEnqueued(ZuulTestCase):
class TestZuulTriggerProjectChangeMerged(ZuulTestCase):
def setUp(self):
self.skip("Disabled because v3 noop job does not perform merge")
tenant_config_file = 'config/zuultrigger/project-change-merged/main.yaml'
def test_zuul_trigger_project_change_merged(self):