diff mbox

[Branch,~linaro-validation/lava-dispatcher/trunk] Rev 334: make passing timeout in respsones to CommandRunner.run do something more useful

Message ID 20120627021109.15393.24396.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Michael-Doyle Hudson June 27, 2012, 2:11 a.m. UTC 
Merge authors:
  Michael Hudson-Doyle (mwhudson)
Related merge proposals:
  https://code.launchpad.net/~mwhudson/lava-dispatcher/CommandRunner-timeout-bug-1009302/+merge/112003
  proposed by: Michael Hudson-Doyle (mwhudson)
  review: Approve - Andy Doan (doanac)
------------------------------------------------------------
revno: 334 [merge]
committer: Michael Hudson-Doyle <michael.hudson@linaro.org>
branch nick: trunk
timestamp: Wed 2012-06-27 14:10:36 +1200
message:
  make passing timeout in respsones to CommandRunner.run do something more useful
modified:
  lava_dispatcher/client/base.py


--
lp:lava-dispatcher
https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk

You are subscribed to branch lp:lava-dispatcher.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'lava_dispatcher/client/base.py'
--- lava_dispatcher/client/base.py	2012-06-25 19:42:56 +0000
+++ lava_dispatcher/client/base.py	2012-06-26 05:08:49 +0000
@@ -79,6 +79,8 @@ 
         if response is not None:
             self.match_id = self._connection.expect(response, timeout=timeout)
             self.match = self._connection.match
+            if self.match == pexpect.TIMEOUT:
+                return None
             # If a non-trivial timeout was specified, it is held to apply to
             # the whole invocation, so now reduce the time we'll wait for the
             # shell prompt.