commit be73c2e2951735371576dab2a5343c040154e7aa
author Kalin Stoyanov <kalin@chromium.org> Mon Nov 24 09:58:24 2014 -0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Tue Nov 25 03:47:09 2014 +0000
tree 46199ae98b2119c73fd1921c30e653deb613f37f
parent ac0b164644b3be0d851da77612a222572b81de21

Add a delay afetr restart

BUG=chromium:433593
TEST=Locally tested

Change-Id: I90d4e9900f56c7d634b4e805fd75ad95920dcc34
Reviewed-on: https://chromium-review.googlesource.com/231680
Reviewed-by: Chirag Gupta <chiraggupta@chromium.org>
Tested-by: Kalin Stoyanov <kalin@chromium.org>
Commit-Queue: Kalin Stoyanov <kalin@chromium.org>

server/site_tests/platform_ExternalUsbPeripherals/control.set2

diff --git a/server/site_tests/platform_ExternalUsbPeripherals/control.set2 b/server/site_tests/platform_ExternalUsbPeripherals/control.set2
index 351eeff..23d460e 100644
--- a/server/site_tests/platform_ExternalUsbPeripherals/control.set2
+++ b/server/site_tests/platform_ExternalUsbPeripherals/control.set2
@@ -43,7 +43,7 @@
 def run(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
 
-    repeat = int(args_dict.get("repeat", 2))
+    repeat = int(args_dict.get("repeat", 1))
 
     default_actions = str("reboot,unplug,plug,login,unplug,plug,"
                           "suspend,resume,unplug,suspend,plug,resume,"

server/site_tests/platform_ExternalUsbPeripherals/platform_ExternalUsbPeripherals.py

diff --git a/server/site_tests/platform_ExternalUsbPeripherals/platform_ExternalUsbPeripherals.py b/server/site_tests/platform_ExternalUsbPeripherals/platform_ExternalUsbPeripherals.py
index 3657f83..ed79701 100644
--- a/server/site_tests/platform_ExternalUsbPeripherals/platform_ExternalUsbPeripherals.py
+++ b/server/site_tests/platform_ExternalUsbPeripherals/platform_ExternalUsbPeripherals.py
@@ -325,7 +325,7 @@
 
         # Collect USB peripherals when plugged
         self.set_hub_power(True)
-        time.sleep(_WAIT_DELAY*2)
+        time.sleep(_WAIT_DELAY * 2)
         self.on_list = self.getPluggedUsbDevices()
 
         diff_list = set(self.on_list).difference(set(self.off_list))
@@ -366,6 +366,7 @@
                             self.login_status = True
                     elif action == 'REBOOT':
                         self.host.reboot()
+                        time.sleep(_WAIT_DELAY * 3)
                         self.login_status = False
                     elif action == 'SUSPEND':
                         self.action_suspend()