Revert "Rename SSHHost.run to SSHHost.run_very_slowly"
This reverts commit 672fb5f8806694d9476f016c0f1094da29120f31.
Reason for revert: Broke android tests: crbug.com/737316
Original change's description:
> Rename SSHHost.run to SSHHost.run_very_slowly
>
> This CL renames several places that calls SSHHost.run directly to SSHHost.run_very_slowly.
> In addition, it warns the caller with a more verbose server stack message now.
>
> BUG=chromium:735653
> TEST=test_that dut graphics_Sanity
> ./utils/unittest_suite.py --debug
> CQ-DEPEND=I2a434782b9b7ed7a3d31289d9925f3c8502a6d9f
>
> Change-Id: Icd22fe9bcc4b5a47320478932194a8b535f4a936
> Reviewed-on: https://chromium-review.googlesource.com/545116
> Commit-Ready: Po-Hsien Wang <pwang@chromium.org>
> Tested-by: Po-Hsien Wang <pwang@chromium.org>
> Reviewed-by: Ilja H. Friedel <ihf@chromium.org>
Bug: chromium:735653
Change-Id: If57cd6103d73bc1f0335866d8c130953754df0d9
Reviewed-on: https://chromium-review.googlesource.com/550970
Reviewed-by: Allen Li <ayatane@chromium.org>
Tested-by: Allen Li <ayatane@chromium.org>
Trybot-Ready: Allen Li <ayatane@chromium.org>
diff --git a/server/hosts/abstract_ssh.py b/server/hosts/abstract_ssh.py
index c7ca60a..c3a1a19 100644
--- a/server/hosts/abstract_ssh.py
+++ b/server/hosts/abstract_ssh.py
@@ -121,8 +121,7 @@
Check if rsync is available on the remote host.
"""
try:
- self.run_very_slowly("rsync --version",
- stdout_tee=None, stderr_tee=None)
+ self.run("rsync --version", stdout_tee=None, stderr_tee=None)
except error.AutoservRunError:
return False
return True
@@ -523,14 +522,13 @@
"""
ctimeout = min(timeout, connect_timeout or timeout)
try:
- self.run_very_slowly(base_cmd, timeout=timeout,
- connect_timeout=ctimeout,
- ssh_failure_retry_ok=True)
+ self.run(base_cmd, timeout=timeout, connect_timeout=ctimeout,
+ ssh_failure_retry_ok=True)
except error.AutoservSSHTimeout:
msg = "Host (ssh) verify timed out (timeout = %d)" % timeout
raise error.AutoservSSHTimeout(msg)
except error.AutoservSshPermissionDeniedError:
- # let AutoservSshPermissionDeniedError be visible to the callers
+ #let AutoservSshPermissionDeniedError be visible to the callers
raise
except error.AutoservRunError, e:
# convert the generic AutoservRunError into something more