Clean up short timeouts that are causing flakes during testing.
BUG=chromium:269824
TEST=Visual + pyflakes
Change-Id: Ia96e701b80aa56223afd2b0c7956aea25b637942
Reviewed-on: https://chromium-review.googlesource.com/170025
Tested-by: Chris Sosa <sosa@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Commit-Queue: Chris Sosa <sosa@chromium.org>
diff --git a/client/common_lib/cros/autoupdater.py b/client/common_lib/cros/autoupdater.py
index ce79c18..a15d621 100644
--- a/client/common_lib/cros/autoupdater.py
+++ b/client/common_lib/cros/autoupdater.py
@@ -196,8 +196,7 @@
"""Clear any pending stateful update request."""
statefuldev_cmd = [self.get_stateful_update_script()]
statefuldev_cmd += ['--stateful_change=reset', '2>&1']
- # This shouldn't take any time at all.
- self._run(' '.join(statefuldev_cmd), timeout=10)
+ self._run(' '.join(statefuldev_cmd))
def revert_boot_partition(self):
@@ -217,8 +216,7 @@
UPDATER_BIN, self.update_url)
logging.info('triggering update via: %s', autoupdate_cmd)
try:
- # This should return immediately, hence the short timeout.
- self._run(autoupdate_cmd, timeout=10)
+ self._run(autoupdate_cmd)
except error.AutoservRunError, e:
raise RootFSUpdateError('update triggering failed on %s: %s' %
(self.host.hostname, str(e)))