commit 83e6b54fa090935000130fd1786422d34717d055
author Richard Barnette <jrbarnette@chromium.org> Fri Dec 13 21:38:03 2013 +0000
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Dec 13 23:39:07 2013 +0000
tree 1d23033870455d7ed87835567b23521fdcb2e3a1
parent eea1236dcf4238aa8c07d62b65c9fbcb26d064d4

Revert "Improve the standard error message in the lab if an update fails."

This reverts commit 71fe97fe10f6979e7db628e28ef0de087b79c021.

BUG=chromium:328522

Change-Id: Iec595fa3094a8079056786db88c8639209896fec
Reviewed-on: https://chromium-review.googlesource.com/180046
Reviewed-by: Richard Barnette <jrbarnette@chromium.org>
Commit-Queue: Richard Barnette <jrbarnette@chromium.org>
Tested-by: Richard Barnette <jrbarnette@chromium.org>

client/common_lib/cros/autoupdater.py

diff --git a/client/common_lib/cros/autoupdater.py b/client/common_lib/cros/autoupdater.py
index e641c4a..af2dae3 100644
--- a/client/common_lib/cros/autoupdater.py
+++ b/client/common_lib/cros/autoupdater.py
@@ -222,18 +222,9 @@
         logging.info('Triggering update via: %s', autoupdate_cmd)
         try:
             self._run(autoupdate_cmd)
-        except (error.AutoservSshPermissionDeniedError,
-                error.AutoservSSHError,
-                error.AutoservSSHTimeout) as e:
-            raise RootFSUpdateError('SSH on %s is seeing %s' %
-                                    (self.host.hostname, type(e).__name__))
-
-        except error.AutoservRunError as e:
-            raise RootFSUpdateError(
-                'devserver unreachable, payload unavailable, '
-                'or AU bug (unlikely) on %s: %s' %
-                (self.host.hostname, type(e).__name__))
-
+        except error.AutoservRunError, e:
+            raise RootFSUpdateError('Update triggering failed on %s: %s' %
+                                    (self.host.hostname, str(e)))
 
     def _verify_update_completed(self):
         """Verifies that an update has completed.

client/common_lib/cros/autoupdater_unittest.py

diff --git a/client/common_lib/cros/autoupdater_unittest.py b/client/common_lib/cros/autoupdater_unittest.py
index a36185b..51cd3c9 100755
--- a/client/common_lib/cros/autoupdater_unittest.py
+++ b/client/common_lib/cros/autoupdater_unittest.py
@@ -9,7 +9,6 @@
 import common
 
 import autoupdater
-from autotest_lib.client.common_lib import error
 
 
 class TestAutoUpdater(mox.MoxTestBase):
@@ -319,55 +318,6 @@
         self.assertTrue(updater.check_version_to_confirm_install())
 
 
-    def testTriggerUpdate(self):
-        """Tests that we correctly handle updater errors."""
-        self.mox.StubOutWithMock(autoupdater.ChromiumOSUpdater, '_run')
-        update_url = 'http://server/test/url'
-        host = self.mox.CreateMockAnything()
-        host.hostname = 'test_host'
-
-        expected_cmd = ('/usr/bin/update_engine_client --check_for_update '
-                        '--omaha_url=http://server/test/url')
-
-        updater = autoupdater.ChromiumOSUpdater(update_url, host=host)
-
-        # Test with success.
-        autoupdater.ChromiumOSUpdater._run(expected_cmd)
-
-        # SSH Timeout
-        autoupdater.ChromiumOSUpdater._run(expected_cmd).AndRaise(
-                error.AutoservSSHTimeout("ssh timed out", 255))
-
-        # SSH Permission Error
-        autoupdater.ChromiumOSUpdater._run(expected_cmd).AndRaise(
-                error.AutoservSshPermissionDeniedError("ssh timed out", 255))
-
-        # Generic SSH Error
-        autoupdater.ChromiumOSUpdater._run(expected_cmd).AndRaise(
-                error.AutoservSSHError("ssh timed out", 255))
-
-        # Command Failed Error
-        autoupdater.ChromiumOSUpdater._run(expected_cmd).AndRaise(
-                error.AutoservRunError("ssh timed out", 1))
-
-        self.mox.ReplayAll()
-
-        # Verify Success.
-        updater.trigger_update()
-
-        # Verify each type of error listed above.
-        self.assertRaises(autoupdater.RootFSUpdateError,
-                          updater.trigger_update)
-        self.assertRaises(autoupdater.RootFSUpdateError,
-                          updater.trigger_update)
-        self.assertRaises(autoupdater.RootFSUpdateError,
-                          updater.trigger_update)
-        self.assertRaises(autoupdater.RootFSUpdateError,
-                          updater.trigger_update)
-
-        self.mox.VerifyAll()
-
-
     def testUpdateStateful(self):
         """Tests that we call the stateful update script with the correct args.
         """