From 5661bda13955827238b525ed83a2ac8454a3eda6 Mon Sep 17 00:00:00 2001 From: Adam Gandelman Date: Fri, 3 Feb 2017 15:58:03 -0800 Subject: [PATCH] Re-enable test_file_jobs Story: 200773 Task: 3464 Change-Id: Ie07de08088752d5982df2d600309331fbf799a43 --- .../fixtures/config/single-tenant/git/common-config/zuul.yaml | 1 + tests/unit/test_scheduler.py | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/fixtures/config/single-tenant/git/common-config/zuul.yaml b/tests/fixtures/config/single-tenant/git/common-config/zuul.yaml index ad7c35252e..b91bf6f4ac 100644 --- a/tests/fixtures/config/single-tenant/git/common-config/zuul.yaml +++ b/tests/fixtures/config/single-tenant/git/common-config/zuul.yaml @@ -123,6 +123,7 @@ jobs: - project-test1 - project-test2 + - project-testfile post: jobs: - project-post diff --git a/tests/unit/test_scheduler.py b/tests/unit/test_scheduler.py index 42e8687f54..62e69f210d 100755 --- a/tests/unit/test_scheduler.py +++ b/tests/unit/test_scheduler.py @@ -2114,11 +2114,10 @@ class TestScheduler(ZuulTestCase): self.assertIn('Build succeeded', A.messages[0]) self.assertIn('Build succeeded', B.messages[0]) - @skip("Disabled for early v3 development") def test_file_jobs(self): "Test that file jobs run only when appropriate" A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') - A.addPatchset(['pip-requires']) + A.addPatchset({'pip-requires': 'foo'}) B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') A.addApproval('code-review', 2) B.addApproval('code-review', 2)