commit 796fcf152898f02d65237a27a26f3129489d5d6c
author Chris Masone <cmasone@chromium.org> Wed Feb 22 16:53:31 2012 -0800
committer Gerrit <chrome-bot@google.com> Thu Feb 23 09:47:26 2012 -0800
tree c6c7a3224adb86dd20f1da0ced10c4a72bda24be
parent 711bbae128d32a3451f13afe84dbd669c337b053

[autotest] Record exceptional job termination correctly

Ensure that exception that occur during Reimager.attempt get caught and
logged, so that we can record 'END ERROR' appropriately.

BUG=chromium-os:26550
TEST=new unit test
TEST=manually ran a job with a doomed-to-fail RPC in it
STATUS=Fixed

Change-Id: Ieb076c14424cb7699edfdb88079ea2b43de279e0
Reviewed-on: https://gerrit.chromium.org/gerrit/16441
Commit-Ready: Chris Masone <cmasone@chromium.org>
Reviewed-by: Chris Masone <cmasone@chromium.org>
Tested-by: Chris Masone <cmasone@chromium.org>

server/cros/dynamic_suite_unittest.py

diff --git a/server/cros/dynamic_suite_unittest.py b/server/cros/dynamic_suite_unittest.py
index 2eb934e..04ca80a 100755
--- a/server/cros/dynamic_suite_unittest.py
+++ b/server/cros/dynamic_suite_unittest.py
@@ -167,10 +167,11 @@
         self.reimager._schedule_reimage_job(self._BUILD, self._NUM, self._BOARD)
 
 
-    def expect_attempt(self, success):
+    def expect_attempt(self, success, ex=None):
         """Sets up |self.reimager| to expect an attempt() that returns |success|
 
-        @param success the value returned by poll_job_results()
+        @param success: the value returned by poll_job_results()
+        @param ex: if not None, |ex| is raised by get_jobs()
         @return a FakeJob configured with appropriate expectations
         """
         canary = FakeJob()
@@ -186,8 +187,12 @@
             self.reimager._report_results(canary, mox.IgnoreArg())
 
         self.afe.get_jobs(id=canary.id, not_yet_run=True).AndReturn([])
-        self.afe.get_jobs(id=canary.id, finished=True).AndReturn([canary])
-        self.afe.poll_job_results(mox.IgnoreArg(), canary, 0).AndReturn(success)
+        if ex is not None:
+            self.afe.get_jobs(id=canary.id, finished=True).AndRaise(ex)
+        else:
+            self.afe.get_jobs(id=canary.id, finished=True).AndReturn([canary])
+            self.afe.poll_job_results(mox.IgnoreArg(),
+                                      canary, 0).AndReturn(success)
 
         return canary
 
@@ -226,6 +231,18 @@
         self.reimager.attempt(self._BUILD, self._BOARD, rjob.record)
 
 
+    def testReimageThatRaised(self):
+        """Should attempt a reimage that raises an exception and record that."""
+        ex_message = 'Oh no!'
+        canary = self.expect_attempt(None, Exception(ex_message))
+
+        rjob = self.mox.CreateMock(base_job.base_job)
+        rjob.record('START', mox.IgnoreArg(), mox.IgnoreArg())
+        rjob.record('END ERROR', mox.IgnoreArg(), mox.IgnoreArg(), ex_message)
+        self.mox.ReplayAll()
+        self.reimager.attempt(self._BUILD, self._BOARD, rjob.record)
+
+
 class SuiteTest(mox.MoxTestBase):
     """Unit tests for dynamic_suite.Suite.