commit 6ee645357e48ac0a32a4543e29f58a7b6bc5d183
author Justin Giorgi <jgiorgi@google.com> Wed Aug 10 11:32:04 2016 -0700
committer chrome-bot <chrome-bot@chromium.org> Sat Aug 13 13:58:36 2016 -0700
tree 0d349e43c9040500565d2f2acd3e8ada0e27acaf
parent 455ec8d722c95a1f64c9540df403c02ac5d580fe

[autotest] GenericHostRunError.

Renamed HostRunErrorMixIn to GenericHostRunError as a generic
error used for both client and server host.run failures. Fixed ADBHost,
EmulatedADBHost, EmulatorManager and all android/brillo tests to catch this
exception where they were catching one or both of AutotestHostRunError and
AutoservRunError.

TEST=Verified locally, ran unit tests.
BUG=None

Change-Id: I87e166bd580df7dd4b021e2fe0b426beaba2c270
Reviewed-on: https://chromium-review.googlesource.com/367015
Commit-Ready: Justin Giorgi <jgiorgi@google.com>
Tested-by: Justin Giorgi <jgiorgi@google.com>
Reviewed-by: Dan Shi <dshi@chromium.org>

utils/emulator_manager.py

diff --git a/utils/emulator_manager.py b/utils/emulator_manager.py
index 470767a..395d521 100644
--- a/utils/emulator_manager.py
+++ b/utils/emulator_manager.py
@@ -38,7 +38,7 @@
                                             'between 5555 and 5585.')
         try:
             run('test -f %s' % os.path.join(imagedir, 'system.img'))
-        except (error.AutoservRunError, error.AutotestHostRunError):
+        except error.GenericHostRunError:
             raise EmulatorManagerException('Image directory must exist and '
                                            'contain emulator images.')