commit 5ed0245376029fb175f7610c2b48b0aadbd20cdd
author Yu-Ju Hong <yjhong@chromium.org> Thu Jan 30 09:05:00 2014 -0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Thu Jan 30 21:39:56 2014 +0000
tree acd91326930733e7d4206aef6fd5ebaaacf41f25
parent 6997e1cf5d4617c0e9709dd8981e859aaaa861ca

devinstall_test: catch SSHConnectionError during VM startup

SSHConnectionError has recently been added to remote_access to
distinguish shell command error and ssh connection
error. devinstall_test needs to catch this new exception.

BUG=chromium:339135
TEST=None

Change-Id: I0304c9130c677dab26bc7eaa5c6eea8c18694938
Reviewed-on: https://chromium-review.googlesource.com/184461
Reviewed-by: Scott Zawalski <scottz@chromium.org>
Commit-Queue: Yu-Ju Hong <yjhong@chromium.org>
Tested-by: Yu-Ju Hong <yjhong@chromium.org>

devmode-test/devinstall_test.py

diff --git a/devmode-test/devinstall_test.py b/devmode-test/devinstall_test.py
index d27707c..b0eb3c5 100755
--- a/devmode-test/devinstall_test.py
+++ b/devmode-test/devinstall_test.py
@@ -139,7 +139,8 @@
             ConnectTimeout=_CONNECT_TIMEOUT)
         self.remote_access.RemoteSh(['true'], connect_settings=ssh_settings)
         return
-      except cros_build_lib.RunCommandError as e:
+      except (cros_build_lib.RunCommandError,
+              remote_access.SSHConnectionError) as e:
         logging.warning('Failed to connect to VM')
         logging.warning(e)
         self._StopVM()
@@ -194,7 +195,8 @@
       self.remote_access.RemoteSh(
           ['sudo', '-u', 'chronos', '--',
            'python', '-c', '"print \'hello world\'"'])
-    except cros_build_lib.RunCommandError as e:
+    except (cros_build_lib.RunCommandError,
+            remote_access.SSHConnectionError) as e:
       self.devserver.PrintLog()
       logging.error('dev-install test failed. See devserver log above for more '
                     'details.')
@@ -208,7 +210,8 @@
           ['gmerge', 'gmerge', '--accept_stable', '--usepkg',
            '--devserver_url', self.devserver.GetDevServerURL(),
            '--board', self.board])
-    except cros_build_lib.RunCommandError as e:
+    except (cros_build_lib.RunCommandError,
+            remote_access.SSHConnectionError) as e:
       logging.error('gmerge test failed. See log for details')
       raise TestError('gmerge test failed with: %s' % str(e))