Revert "Add a timeout arg for waiting the first socket."
This reverts commit 44392962fb674492961a328f49396e7eee78d592.
Without reverting the patch 4439296,
reboot test will fail frequently (3~5 trials then fail)
BUG=chrome-os-partner:17128
TEST=run reboot test on dut. revert 4439296: can pass 60 consequent
reboot test.
Change-Id: Ie3536092cfe66b5b6c0421aef7c6b929a9607845
Reviewed-on: https://gerrit.chromium.org/gerrit/44926
Commit-Queue: Shuo-Peng Liao <deanliao@chromium.org>
Reviewed-by: Shuo-Peng Liao <deanliao@chromium.org>
Tested-by: Shuo-Peng Liao <deanliao@chromium.org>
diff --git a/py/goofy/goofy.py b/py/goofy/goofy.py
index 4a17583..f059b8d 100755
--- a/py/goofy/goofy.py
+++ b/py/goofy/goofy.py
@@ -33,7 +33,6 @@
from cros.factory.goofy.goofy_rpc import GoofyRPC
from cros.factory.goofy.invocation import TestInvocation
from cros.factory.goofy.prespawner import Prespawner
-from cros.factory.goofy.web_socket_manager import WebSocketException
from cros.factory.goofy.web_socket_manager import WebSocketManager
from cros.factory.system.charge_manager import ChargeManager
from cros.factory.system import disk_space
@@ -63,8 +62,6 @@
RUN_QUEUE_TIMEOUT_SECS = 10
-WAIT_FOR_SOCKET_TIMEOUT_SECS = 5
-
GOOFY_IN_CHROOT_WARNING = '\n' + ('*' * 70) + '''
You are running Goofy inside the chroot. Autotests are not supported.
@@ -1188,11 +1185,7 @@
if self.options.ui == 'chrome':
self.env.launch_chrome()
logging.info('Waiting for a web socket connection')
- try:
- self.web_socket_manager.wait(timeout_sec=(
- None if factory.in_chroot() else WAIT_FOR_SOCKET_TIMEOUT_SECS))
- except WebSocketException:
- sys.exit('Failed to wait for a socket. Exiting Goofy.')
+ self.web_socket_manager.wait()
# Wait for the test widget size to be set; this is done in
# an asynchronous RPC so there is a small chance that the