| commit | 9f0ed18238cbdaab3d4fff6869ef0da210726c50 | [log] [tgz] |
|---|---|---|
| author | Zuul <zuul@review.openstack.org> | Wed Nov 29 17:57:32 2017 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Wed Nov 29 17:57:32 2017 +0000 |
| tree | 9f2a83ea22506de631e60711df1700bcb8a7152f | |
| parent | 504e2bdb545c0cba45cdcf57e44bcc9ac189110c [diff] | |
| parent | 3ea845fd2518ae107241968bf4902e33d48ab2ec [diff] |
Merge "Re-enable test_zuul_trigger_project_change_merged" into feature/zuulv3
diff --git a/tests/fixtures/config/zuultrigger/project-change-merged/main.yaml b/tests/fixtures/config/zuultrigger/project-change-merged/main.yaml index 9d01f54..208e274 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 3c4dead..3954a21 100644 --- a/tests/unit/test_zuultrigger.py +++ b/tests/unit/test_zuultrigger.py
@@ -64,9 +64,6 @@ 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):