commit 6736bebf616377ccb75cb8894bd0eb5fbf44edcc
author James E. Blair <jeblair@openstack.org> Thu Jul 11 15:18:15 2013 -0700
committer James E. Blair <jeblair@openstack.org> Thu Jul 18 14:49:04 2013 -0700
tree 3f917589444a72cd6a14ee2e870e78806a18d1b8
parent c225b4dcf4fa259eb0ce651438cb7e5f8fc4a525

Dequeue changes immediately on merge conflicts

Change-Id: I4a2b9c5bc3a5659e874fe2bccbbd61da01713b9a

tests/test_scheduler.py

diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py
index 0a8b16a..448f5ec 100644
--- a/tests/test_scheduler.py
+++ b/tests/test_scheduler.py
@@ -715,6 +715,7 @@
         self.init_repo("org/nonvoting-project")
         self.init_repo("org/templated-project")
         self.init_repo("org/node-project")
+        self.init_repo("org/conflict-project")
 
         self.statsd = FakeStatsd()
         os.environ['STATSD_HOST'] = 'localhost'
@@ -1498,11 +1499,14 @@
         "Test that merge conflicts are handled"
 
         self.gearman_server.hold_jobs_in_queue = True
-        A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
+        A = self.fake_gerrit.addFakeChange('org/conflict-project',
+                                           'master', 'A')
         A.addPatchset(['conflict'])
-        B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
+        B = self.fake_gerrit.addFakeChange('org/conflict-project',
+                                           'master', 'B')
         B.addPatchset(['conflict'])
-        C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
+        C = self.fake_gerrit.addFakeChange('org/conflict-project',
+                                           'master', 'C')
         A.addApproval('CRVW', 2)
         B.addApproval('CRVW', 2)
         C.addApproval('CRVW', 2)
@@ -1511,6 +1515,10 @@
         self.fake_gerrit.addEvent(C.addApproval('APRV', 1))
         self.waitUntilSettled()
 
+        self.assertEqual(A.reported, 1)
+        self.assertEqual(B.reported, 1)
+        self.assertEqual(C.reported, 1)
+
         self.gearman_server.release('.*-merge')
         self.waitUntilSettled()
         self.gearman_server.release('.*-merge')
@@ -1530,6 +1538,32 @@
         self.assertEqual(B.reported, 2)
         self.assertEqual(C.reported, 2)
 
+    def test_dequeue_conflict(self):
+        "Test that the option to dequeue merge conflicts works"
+
+        self.gearman_server.hold_jobs_in_queue = True
+        A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
+        A.addPatchset(['conflict'])
+        B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
+        B.addPatchset(['conflict'])
+        A.addApproval('CRVW', 2)
+        B.addApproval('CRVW', 2)
+        self.fake_gerrit.addEvent(A.addApproval('APRV', 1))
+        self.fake_gerrit.addEvent(B.addApproval('APRV', 1))
+        self.waitUntilSettled()
+
+        self.assertEqual(A.reported, 1)
+        self.assertEqual(B.reported, 2)
+
+        self.gearman_server.hold_jobs_in_queue = False
+        self.gearman_server.release()
+        self.waitUntilSettled()
+
+        self.assertEqual(A.data['status'], 'MERGED')
+        self.assertEqual(B.data['status'], 'NEW')
+        self.assertEqual(A.reported, 2)
+        self.assertEqual(B.reported, 2)
+
     def test_post(self):
         "Test that post jobs run"