zuul
/
zuul
Code Issues Proposed changes

Merge "Re-enable test_file_jobs" into feature/zuulv3

This commit is contained in:
Jenkins 2017-02-06 14:42:48 +00:00 committed by Gerrit Code Review
parent 2e9db8aaad 5661bda139
commit 1178f51635
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/fixtures/config/single-tenant/git/common-config/zuul.yaml vendored
View File

@ -123,6 +123,7 @@
jobs:
- project-test1
- project-test2
- project-testfile
post:
jobs:
- project-post

3
tests/unit/test_scheduler.py
View File

@ -1996,11 +1996,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)