commit fdceb4d0c2314b6fb8f92232c3d458e1c08734fc
author Yu-Ju Hong <yjhong@chromium.org> Mon Dec 16 17:06:00 2013 -0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Tue Dec 17 04:26:48 2013 +0000
tree 35bd1f3eb30c70131aa52bab70b508eeb6329e04
parent 48fc7df29cc0a70afc85f82bc34dd17353d7a6e4

Fix reboot timeout in remote_access.py

The timeout and period values are passed incorrectly.

BUG=None
TEST=unittest
TEST=device reboots

Change-Id: If78f9758c91ccb51ac3540e7311f21a294db4452
Reviewed-on: https://chromium-review.googlesource.com/180370
Reviewed-by: David James <davidjames@chromium.org>
Commit-Queue: Yu-Ju Hong <yjhong@chromium.org>
Tested-by: Yu-Ju Hong <yjhong@chromium.org>
Reviewed-by: Matt Tennant <mtennant@chromium.org>

lib/remote_access.py

diff --git a/lib/remote_access.py b/lib/remote_access.py
index 6ab8c27..a7174d4 100644
--- a/lib/remote_access.py
+++ b/lib/remote_access.py
@@ -176,8 +176,8 @@
     self.RemoteSh('touch %s && reboot' % REBOOT_MARKER)
     time.sleep(CHECK_INTERVAL)
     try:
-      timeout_util.WaitForReturnTrue(self._CheckIfRebooted, CHECK_INTERVAL,
-                                     REBOOT_MAX_WAIT)
+      timeout_util.WaitForReturnTrue(self._CheckIfRebooted, REBOOT_MAX_WAIT,
+                                     period=CHECK_INTERVAL)
     except timeout_util.TimeoutError:
       cros_build_lib.Die('Reboot has not completed after %s seconds; giving up.'
                          % (REBOOT_MAX_WAIT,))