zuul
/
zuul
Code Issues Proposed changes

Re-enable test_merger_repack_large_change test 

Update to zuulv3 syntax.

Story: #2000773

Change-Id: I97f3215773e35d56abff315860cccf25c32f53ca
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2016-11-11 19:43:38 -05:00
parent 58bf691d4d
commit 503bdedad6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/test_scheduler.py
View File

@ -1578,13 +1578,13 @@ jobs:
self.assertEqual(A.data['status'], 'MERGED')
self.assertEqual(A.reported, 2)
@skip("Disabled for early v3 development")
def test_merger_repack_large_change(self):
"Test that the merger works with large changes after a repack"
# https://bugs.launchpad.net/zuul/+bug/1078946
# This test assumes the repo is already cloned; make sure it is
tenant = self.sched.abide.tenants.get('tenant-one')
url = self.fake_gerrit.getGitUrl(
self.sched.layout.projects['org/project1'])
tenant.layout.project_configs.get('org/project1'))
self.merge_server.merger.addProject('org/project1', url)
A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
A.addPatchset(large=True)
@ -1596,11 +1596,11 @@ jobs:
A.addApproval('code-review', 2)
self.fake_gerrit.addEvent(A.addApproval('approved', 1))
self.waitUntilSettled()
self.assertEqual(self.getJobFromHistory('project1-merge').result,
self.assertEqual(self.getJobFromHistory('project-merge').result,
'SUCCESS')
self.assertEqual(self.getJobFromHistory('project1-test1').result,
self.assertEqual(self.getJobFromHistory('project-test1').result,
'SUCCESS')
self.assertEqual(self.getJobFromHistory('project1-test2').result,
self.assertEqual(self.getJobFromHistory('project-test2').result,
'SUCCESS')
self.assertEqual(A.data['status'], 'MERGED')
self.assertEqual(A.reported, 2)