diff options
| author | Tobias Henkel <tobias.henkel@bmw.de> | 2017-10-19 07:47:16 +0200 |
|---|---|---|
| committer | Tobias Henkel <tobias.henkel@bmw.de> | 2017-10-19 07:47:16 +0200 |
| commit | 3ea845fd2518ae107241968bf4902e33d48ab2ec (patch) | |
| tree | f947d8d8f3019e8b8a1d984fbf3e857820367aaa | |
| parent | 8fe53b44410034e44af0bf473ab2560f7ca8a1c8 (diff) | |
| download | zuul-3ea845fd2518ae107241968bf4902e33d48ab2ec.tar.gz | |
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
| -rw-r--r-- | tests/fixtures/config/zuultrigger/project-change-merged/main.yaml | 2 | ||||
| -rw-r--r-- | tests/unit/test_zuultrigger.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/fixtures/config/zuultrigger/project-change-merged/main.yaml b/tests/fixtures/config/zuultrigger/project-change-merged/main.yaml index 9d01f542f..208e274b1 100644 --- a/tests/fixtures/config/zuultrigger/project-change-merged/main.yaml +++ b/tests/fixtures/config/zuultrigger/project-change-merged/main.yaml @@ -4,3 +4,5 @@ gerrit: config-projects: - common-config + untrusted-projects: + - org/project diff --git a/tests/unit/test_zuultrigger.py b/tests/unit/test_zuultrigger.py index 3c4dead9f..3954a215d 100644 --- a/tests/unit/test_zuultrigger.py +++ b/tests/unit/test_zuultrigger.py @@ -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): |