Add EOFError to the exceptions we catch in ParamikoHost.run, since it can happen both when opening a channel and when execing a command, and in both cases it's really just the same error.
Signed-off-by: John Admanski <[email protected]> --- autotest/server/hosts/paramiko_host.py 2010-05-05 13:54:09.000000000 -0700 +++ autotest/server/hosts/paramiko_host.py 2010-05-05 13:54:09.000000000 -0700 @@ -256,7 +256,7 @@ try: channel = self._open_channel(timeout) channel.exec_command(command) - except (socket.error, paramiko.SSHException), e: + except (socket.error, paramiko.SSHException, EOFError), e: # This has to match the string from paramiko *exactly*. if str(e) != 'Channel closed.': raise error.AutoservSSHTimeout("ssh failed: %s" % e) _______________________________________________ Autotest mailing list [email protected] http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
