Merge "Re-enable TestScheduler.test_rerun_on_error" into feature/zuulv3

tests/base.py

@@ -758,6 +758,8 @@ class RecordingLaunchServer(zuul.launcher.server.LaunchServer):
         self.running_builds.remove(build)
         del self.job_builds[job.unique]
         self.lock.release()
+        if build.run_error:
+            result = None
         return result
 
 

tests/test_scheduler.py

@@ -2104,7 +2104,6 @@ class TestScheduler(ZuulTestCase):
         self.assertEqual(D.data['status'], 'MERGED')
         self.assertEqual(D.reported, 2)
 
-    @skip("Disabled for early v3 development")
     def test_rerun_on_error(self):
         "Test that if a worker fails to run a job, it is run again"
         self.launch_server.hold_jobs_in_build = True

zuul/launcher/server.py

@@ -380,6 +380,9 @@ class LaunchServer(object):
             job.sendWorkStatus(0, 100)
 
             result = self.runAnsible(jobdir, job)
+            if result is None:
+                job.sendWorkFail()
+                return
             result = dict(result=result)
             job.sendWorkComplete(json.dumps(result))