commit 33cb90b0ee56b23653b86b36136649ccfd90f1fb
author Jenkins <jenkins@review.openstack.org> Wed Nov 09 20:24:18 2016 +0000
committer Gerrit Code Review <review@openstack.org> Wed Nov 09 20:24:18 2016 +0000
tree ce7e21d26932a282478c7e9ac99cde063b22a01a
parent b29a1dde9d38d67a67bc51647d70f989cf4590d3
parent 5bfe9e778447808d4c71d10945e88ca9f4c0de54

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

tests/test_scheduler.py

diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py
index 561c06a..11647ba 100755
--- a/tests/test_scheduler.py
+++ b/tests/test_scheduler.py
@@ -1540,7 +1540,6 @@
         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 @@
         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))