| Index: build/android/pylib/device/adb_wrapper_test.py
|
| diff --git a/build/android/pylib/device/adb_wrapper_test.py b/build/android/pylib/device/adb_wrapper_test.py
|
| index 63254040fd8d17492625b543d58fdd5dc53c889f..08b7fcc99e9bb1b580c1b72736b81db7550800e9 100644
|
| --- a/build/android/pylib/device/adb_wrapper_test.py
|
| +++ b/build/android/pylib/device/adb_wrapper_test.py
|
| @@ -41,7 +41,7 @@ class TestAdbWrapper(unittest.TestCase):
|
| self.assertEqual(output.strip(), 'test')
|
| output = self._adb.Shell('echo test')
|
| self.assertEqual(output.strip(), 'test')
|
| - self.assertRaises(device_errors.CommandFailedError, self._adb.Shell,
|
| + self.assertRaises(device_errors.AdbCommandFailedError, self._adb.Shell,
|
| 'echo test', expect_rc=1)
|
|
|
| def testPushPull(self):
|
| @@ -56,13 +56,15 @@ class TestAdbWrapper(unittest.TestCase):
|
|
|
| def testInstall(self):
|
| path = self._MakeTempFile('foo')
|
| - self.assertRaises(device_errors.CommandFailedError, self._adb.Install, path)
|
| + self.assertRaises(device_errors.AdbCommandFailedError, self._adb.Install,
|
| + path)
|
|
|
| def testForward(self):
|
| - self.assertRaises(device_errors.CommandFailedError, self._adb.Forward, 0, 0)
|
| + self.assertRaises(device_errors.AdbCommandFailedError, self._adb.Forward,
|
| + 0, 0)
|
|
|
| def testUninstall(self):
|
| - self.assertRaises(device_errors.CommandFailedError, self._adb.Uninstall,
|
| + self.assertRaises(device_errors.AdbCommandFailedError, self._adb.Uninstall,
|
| 'some.nonexistant.package')
|
|
|
| def testRebootWaitForDevice(self):
|
| @@ -82,7 +84,7 @@ class TestAdbWrapper(unittest.TestCase):
|
| try:
|
| self._adb.Shell('start')
|
| break
|
| - except device_errors.CommandFailedError:
|
| + except device_errors.AdbCommandFailedError:
|
| time.sleep(1)
|
| self._adb.Remount()
|
|
|
|
|