[autotest] eliminate exception-passing multiprocess queue
Now that multiprocess usage has been eliminated, we no longer need the
complexity of the update_error_queue
BUG=chromium:547548
TEST=trybot
Change-Id: I13bc02306ebac68eb0d0a6795b39af8a4cbe0830
Reviewed-on: https://chromium-review.googlesource.com/348961
Commit-Ready: Aviv Keshet <akeshet@chromium.org>
Tested-by: Aviv Keshet <akeshet@chromium.org>
Reviewed-by: Chris Sosa <sosa@chromium.org>
diff --git a/client/common_lib/cros/autoupdater.py b/client/common_lib/cros/autoupdater.py
index f2d89c6..91e45b5 100644
--- a/client/common_lib/cros/autoupdater.py
+++ b/client/common_lib/cros/autoupdater.py
@@ -5,7 +5,6 @@
import glob
import httplib
import logging
-import multiprocessing
import os
import re
import urlparse
@@ -138,7 +137,6 @@
self.updater_ctrl_bin = updater_ctrl_bin
self.update_url = update_url
self.host = host
- self._update_error_queue = multiprocessing.Queue(2)
def check_update_status(self):
@@ -240,14 +238,9 @@
logging.info('Updating image via: %s', autoupdate_cmd)
to_raise = self._base_update_handler(run_args, err_prefix)
if to_raise:
- self._update_error_queue.put(to_raise)
raise to_raise
- try:
- self._verify_update_completed()
- except RootFSUpdateError as e:
- self._update_error_queue.put(e)
- raise
+ self._verify_update_completed()
class ChromiumOSUpdater(BaseUpdater):
@@ -463,13 +456,7 @@
update_error = StatefulUpdateError(
'Failed to perform stateful update on %s' %
self.host.hostname)
- self._update_error_queue.put(update_error)
raise update_error
- except Exception as e:
- # Don't allow other exceptions to not be caught.
- self._update_error_queue.put(e)
- raise e
-
@_timer.decorate
def run_update(self, update_root=True):