zuul
/
zuul
Code Issues Proposed changes

Re-enable test_rerun_on_abort 

The order of operations for this one has changed a bit due to the
different interactions with launchers. We run one less operation now
because the first release actually does do the full launch-dance and
incur a single retry before we enter the loop of retries. Because of
that, our history is one less, and the number of times we force retry is
one less.

Change-Id: I6d7d8d0f7e49a11e926667fbe772535ebdd35e89
Story: 2000773
Task: 3413
This commit is contained in:
Clint Byrum 2016-12-05 06:39:11 -08:00
parent 69e4712574
commit df0a55bbbd
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/test_scheduler.py
View File

@ -4551,36 +4551,36 @@ For CI problems and help debugging, contact ci@example.org"""
# No more messages reported via smtp
self.assertEqual(3, len(self.smtp_messages))
@skip("Disabled for early v3 development")
def test_rerun_on_abort(self):
"Test that if a worker fails to run a job, it is run again"
"Test that if a launch server fails to run a job, it is run again"
self.config.set('zuul', 'layout_config',
'tests/fixtures/layout-abort-attempts.yaml')
self.sched.reconfigure(self.config)
self.worker.hold_jobs_in_build = True
self.launch_server.hold_jobs_in_build = True
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
self.waitUntilSettled()
self.worker.release('.*-merge')
self.launch_server.release('.*-merge')
self.waitUntilSettled()
self.assertEqual(len(self.builds), 2)
self.builds[0].requeue = True
self.worker.release('.*-test*')
self.launch_server.release('.*-test*')
self.waitUntilSettled()
for x in range(3):
self.assertEqual(len(self.builds), 1)
for x in range(2):
self.assertEqual(len(self.builds), 1,
'len of builds at x=%d is wrong' % x)
self.builds[0].requeue = True
self.worker.release('.*-test1')
self.launch_server.release('.*-test1')
self.waitUntilSettled()
self.worker.hold_jobs_in_build = False
self.worker.release()
self.launch_server.hold_jobs_in_build = False
self.launch_server.release()
self.waitUntilSettled()
self.assertEqual(len(self.history), 6)
self.assertEqual(len(self.history), 5)
self.assertEqual(self.countJobResults(self.history, 'SUCCESS'), 2)
self.assertEqual(A.reported, 1)
self.assertIn('RETRY_LIMIT', A.messages[0])