Merge lp:~le-chi-thu/lava-dispatcher/empty-pexpect-buffer into lp:lava-dispatcher

[Le Chi Thu]

This fix solves this bug. https://bugs.launchpad.net/lava-dispatcher/+bug/796618

[Paul Larson (pwlars)]

I think this should mostly work, but I'm a bit leery of it because I tried some similar things and ran into issues at one point. We've worked around the core issue in the bug for the moment, and some other recent changes should also help prevent it from coming up again I think. We can leave this open for right now, but it might not be needed.

[Le Chi Thu (le-chi-thu)]

Unless you know the reason why this fix is bad, I prefer you merge it in. It
solved the random problems I got when testing the lava-dispatcher.

BR

/Chi Thu

On 14 September 2011 06:28, Paul Larson <email address hidden> wrote:

> I think this should mostly work, but I'm a bit leery of it because I tried
> some similar things and ran into issues at one point. We've worked around
> the core issue in the bug for the moment, and some other recent changes
> should also help prevent it from coming up again I think. We can leave this
> open for right now, but it might not be needed.
> --
>
> https://code.launchpad.net/~le-chi-thu/lava-dispatcher/empty-pexpect-buffer/+merge/74951
> You are the owner of lp:~le-chi-thytu/lava-dispatcher/empty-pexpect-buffer.
>

=== modified file 'lava_dispatcher/client.py'
--- lava_dispatcher/client.py	2011-09-10 03:02:04 +0000
+++ lava_dispatcher/client.py	2011-09-12 07:36:24 +0000
@@ -142,6 +142,7 @@
         self.proc.sendline("hardreset")
 
     def run_shell_command(self, cmd, response=None, timeout=-1):
+        self.empty_pexpect_buffer()
         self.proc.sendline(cmd)
         if response:
             self.proc.expect(response, timeout=timeout)
@@ -203,6 +204,10 @@
     def get_seriallog(self):
         return self.sio.getvalue()
 
+    def empty_pexpect_buffer(self):
+        index = 0
+        while (index == 0):
+            index = self.proc.expect (['.+', pexpect.EOF, pexpect.TIMEOUT], timeout=1)
 
 class SerialIO(file):
     def __init__(self, logfile):