zuul
/
zuul
Code Issues Proposed changes

Merge "Re-enable test_merger_repack test" into feature/zuulv3

This commit is contained in:
Jenkins 2016-11-09 20:24:18 +00:00 committed by Gerrit Code Review
parent b29a1dde9d 5bfe9e7784
commit 33cb90b0ee
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/test_scheduler.py
View File

@ -1540,7 +1540,6 @@ jobs:
self.assertEqual(self.countJobResults(self.history, 'ABORTED'), 15)
self.assertEqual(len(self.history), 44)
@skip("Disabled for early v3 development")
def test_merger_repack(self):
"Test that the merger works after a repack"
@ -1557,7 +1556,7 @@ jobs:
self.assertEqual(A.data['status'], 'MERGED')
self.assertEqual(A.reported, 2)
self.assertEmptyQueues()
self.worker.build_history = []
self.build_history = []
path = os.path.join(self.git_root, "org/project")
print(repack_repo(path))