zuul
/
zuul
Code Issues Proposed changes

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
This commit is contained in:
Tobias Henkel 2017-10-07 07:08:36 +00:00
parent a777fef1c6
commit 26fa8a34d5
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/unit/test_scheduler.py
View File

@ -4607,6 +4607,26 @@ For CI problems and help debugging, contact ci@example.org"""
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 @@ For CI problems and help debugging, contact ci@example.org"""
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):