commit 4410db79154a09bd8df09a4eb48bf1cb15af867a
author Peter Qiu <zqiu@chromium.org> Thu Jun 05 10:32:41 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Tue Jun 10 02:44:07 2014 +0000
tree 41137eb7b02e3c7fa4f4698985a0f8d7eaf814a5
parent 4c6747e5592c921272e8e410424adad0d7a9bee2

Update RPC server shutdown timeout.

When shutting down RPC server, it will restart the chrome UI and wait for the
login prompt to comeback before exiting. This is to make sure chrome UI
is restored to a good state when the test exit.

We currently have timeout of 20 seconds for RPC server to shutdown, and there
are some cases where chrome devices took more than 20 seconds to restart the UI.
To work around this problem, the RPC server shutdown timeout is increased to
90 seconds, which will be the same as the restart UI timeout.

BUG=None
TEST=Run network_WiFi_SimpleConnect.wifi_check11a test

Change-Id: I00a4898fe1a299feb7e4f55f4a6b89389f0293d6
Reviewed-on: https://chromium-review.googlesource.com/202716
Reviewed-by: Christopher Wiley <wiley@chromium.org>
Commit-Queue: Peter Qiu <zqiu@chromium.org>
Tested-by: Peter Qiu <zqiu@chromium.org>

server/hosts/cros_host.py

diff --git a/server/hosts/cros_host.py b/server/hosts/cros_host.py
index 82a30f6..f21e4aa 100644
--- a/server/hosts/cros_host.py
+++ b/server/hosts/cros_host.py
@@ -113,7 +113,8 @@
 
     _RPC_PROXY_URL = 'http://localhost:%d'
     _RPC_SHUTDOWN_POLLING_PERIOD_SECONDS = 2
-    _RPC_SHUTDOWN_TIMEOUT_SECONDS = 20
+    # Set shutdown timeout to account for the time for restarting the UI.
+    _RPC_SHUTDOWN_TIMEOUT_SECONDS = cros_ui.RESTART_UI_TIMEOUT
 
     _RPM_RECOVERY_BOARDS = global_config.global_config.get_config_value('CROS',
             'rpm_recovery_boards', type=str).split(',')