Verify aborted jobs don't count into retry limit
Jobs aborted by the executor are not counted into retry limit.
Extend the test_job_aborted test case to check that.
Change-Id: I47fa60fe8ff9da62cb11e669b11e60233d464794
diff --git a/tests/unit/test_scheduler.py b/tests/unit/test_scheduler.py
index 508e431..224916a 100755
--- a/tests/unit/test_scheduler.py
+++ b/tests/unit/test_scheduler.py
@@ -4607,6 +4607,26 @@
self.waitUntilSettled()
self.assertEqual(len(self.builds), 2)
+
+ # first abort
+ self.builds[0].aborted = True
+ self.executor_server.release('.*-test*')
+ self.waitUntilSettled()
+ self.assertEqual(len(self.builds), 1)
+
+ # second abort
+ self.builds[0].aborted = True
+ self.executor_server.release('.*-test*')
+ self.waitUntilSettled()
+ self.assertEqual(len(self.builds), 1)
+
+ # third abort
+ self.builds[0].aborted = True
+ self.executor_server.release('.*-test*')
+ self.waitUntilSettled()
+ self.assertEqual(len(self.builds), 1)
+
+ # fourth abort
self.builds[0].aborted = True
self.executor_server.release('.*-test*')
self.waitUntilSettled()
@@ -4616,8 +4636,8 @@
self.executor_server.release()
self.waitUntilSettled()
- self.assertEqual(len(self.history), 4)
- self.assertEqual(self.countJobResults(self.history, 'ABORTED'), 1)
+ self.assertEqual(len(self.history), 7)
+ self.assertEqual(self.countJobResults(self.history, 'ABORTED'), 4)
self.assertEqual(self.countJobResults(self.history, 'SUCCESS'), 3)
def test_rerun_on_abort(self):