Index: src/third_party/autotest/files/server/hosts/abstract_ssh.py |
diff --git a/src/third_party/autotest/files/server/hosts/abstract_ssh.py b/src/third_party/autotest/files/server/hosts/abstract_ssh.py |
index e6af1745d5c69b854ec398c08d1a14db055c2609..d42f893ef77551242a591f014281cd4ce2e9eb7c 100644 |
--- a/src/third_party/autotest/files/server/hosts/abstract_ssh.py |
+++ b/src/third_party/autotest/files/server/hosts/abstract_ssh.py |
@@ -295,7 +295,12 @@ class AbstractSSHHost(SiteHost): |
self.run('chown -R %s %s' % (self.target_file_owner, dest)) |
- def ssh_ping(self, timeout=60): |
+ def ssh_ping(self, timeout=5): |
+ """ |
+ TODO(petkov): decreased default timeout from 60 to 5 seconds |
+ to ensure that wait_down works correctly on Chromium OS. Don't |
+ upstream this change assuming the right fix gets implemented. |
+ """ |
try: |
self.run("true", timeout=timeout, connect_timeout=timeout) |
except error.AutoservSSHTimeout: |