From 3ea845fd2518ae107241968bf4902e33d48ab2ec Mon Sep 17 00:00:00 2001 From: Tobias Henkel Date: Thu, 19 Oct 2017 07:47:16 +0200 Subject: [PATCH] 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 --- .../config/zuultrigger/project-change-merged/main.yaml | 2 ++ 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 9d01f542f9..208e274b13 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 3c4dead9f6..3954a215de 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):