LAVA Dispatcher

Merge lp:~mwhudson/lava-dispatcher/CommandRunner-timeout-bug-1009302 into lp:lava-dispatcher

  1. CommandRunner-timeout-bug-1009302
  2. Merge into trunk
Proposed by Michael Hudson-Doyle
Status: Merged
Merged at revision: 334
Proposed branch: lp:~mwhudson/lava-dispatcher/CommandRunner-timeout-bug-1009302
Merge into: lp:lava-dispatcher
Diff against target: 12 lines (+2/-0)
1 file modified
lava_dispatcher/client/base.py (+2/-0)
To merge this branch: bzr merge lp:~mwhudson/lava-dispatcher/CommandRunner-timeout-bug-1009302
Reviewer Review Type Date Requested Status
Andy Doan (community) Approve
Review via email: mp+112003@code.launchpad.net

Description of the change

I think this change fixes the linked bug.

To post a comment you must log in.
Revision history for this message
Andy Doan (doanac) wrote :

did not test, but it looks sensible.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lava_dispatcher/client/base.py'
2--- lava_dispatcher/client/base.py 2012-06-25 19:42:56 +0000
3+++ lava_dispatcher/client/base.py 2012-06-26 05:11:18 +0000
4@@ -79,6 +79,8 @@
5 if response is not None:
6 self.match_id = self._connection.expect(response, timeout=timeout)
7 self.match = self._connection.match
8+ if self.match == pexpect.TIMEOUT:
9+ return None
10 # If a non-trivial timeout was specified, it is held to apply to
11 # the whole invocation, so now reduce the time we'll wait for the
12 # shell prompt.

Subscribers

People subscribed via source and target branches