Merge lp:~pwlars/lava-dispatcher/stop-test-on-timeout into lp:lava-dispatcher

[Paul Larson]

Tested this locally using pwrmgmt test and a 5 second timeout. Worked
great. Hopefully this will prevent future events like we saw recently
with that test.

[Michael Hudson-Doyle (mwhudson)]

Looks OK, I kinda hate bare except:s but as you re-raise at least one of them is probably justifiable :-) We should put some logging statements in when the logging branch lands.

review: Approve

[Spring Zhang (qzhang)]

In fact, in run_shell_command(), rc expect will capture TIMEOUT itself, in this step it won't raise a exception if TIMEOUT, I don't know if it matters. It may make the try statement no sense, but exception can raise when 'response' not expected.
9 + try:
10 + rc = client.run_cmd_tester(cmd, timeout=timeout)

        id = self.proc.expect([pattern1, pexpect.EOF, pexpect.TIMEOUT],
                timeout=timeout)
        if id == 0:
            rc = int(self.proc.match.groups()[0])
        else:
            rc = None
        return rc

review: Approve

=== modified file 'lava_dispatcher/actions/lava-test.py'
--- lava_dispatcher/actions/lava-test.py	2011-09-16 02:37:57 +0000
+++ lava_dispatcher/actions/lava-test.py	2011-09-20 16:43:56 +0000
@@ -85,7 +85,15 @@
         bundle_name = test_name + "-" + datetime.now().strftime("%H%M%S")
         cmd = ('lava-test run %s -o %s/%s.bundle' % (
                 test_name, self.context.lava_result_dir, bundle_name))
-        rc = client.run_cmd_tester(cmd, timeout=timeout)
+        try:
+            rc = client.run_cmd_tester(cmd, timeout=timeout)
+        except:
+            client.proc.sendcontrol('c')
+            try:
+                client.run_cmd_tester('true', timeout=20)
+            except:
+                client.boot_linaro_image()
+            raise
         if rc is None:
             raise OperationFailed("test case getting return value failed")
         elif rc != 0: