Merge "Re-enable test_file_jobs" into feature/zuulv3
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 ad7c352..b91bf6f 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 ee34d56..86c7c2d 100755
--- a/tests/unit/test_scheduler.py
+++ b/tests/unit/test_scheduler.py
@@ -1996,11 +1996,10 @@
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)