commit ff27c3660536ce79bd7c9d45c758dcea4ddc3426
author Thieu Le <thieule@chromium.org> Tue Jun 25 13:03:50 2013 -0700
committer ChromeBot <chrome-bot@google.com> Tue Jun 25 15:32:12 2013 -0700
tree 11519168548a91fb7f49c42641d8efda090f34d7
parent b9e0ee7f0418f3fe62dfde62fe8bc916fb2801fd

shill-test-scripts: Increase cellular timeout in flimflam.py.

Some operations can take up to 60 seconds.

BUG=chromium:243988
TEST=network_3GSmokeTest

Change-Id: I56c96e0207c4e4a719b5547d22abbb9bba51cec3
Reviewed-on: https://gerrit.chromium.org/gerrit/59960
Reviewed-by: Christopher Wiley <wiley@chromium.org>
Commit-Queue: Thieu Le <thieule@chromium.org>
Tested-by: Thieu Le <thieule@chromium.org>

test-scripts/flimflam.py

diff --git a/test-scripts/flimflam.py b/test-scripts/flimflam.py
index 1f17df6..d141c3f 100755
--- a/test-scripts/flimflam.py
+++ b/test-scripts/flimflam.py
@@ -6,6 +6,8 @@
 
 import dbus
 
+DEFAULT_CELLULAR_TIMEOUT = 60
+
 def make_dbus_boolean(value):
     value = value.upper()
     if value in ["ON", "TRUE"]:
@@ -133,7 +135,7 @@
             time.sleep(1)
         return device_obj
 
-    def FindCellularDevice(self, timeout=30):
+    def FindCellularDevice(self, timeout=DEFAULT_CELLULAR_TIMEOUT):
         return self._FindDevice(self.DEVICE_CELLULAR, timeout)
 
     def FindWimaxDevice(self, timeout=30):
@@ -161,7 +163,7 @@
             time.sleep(.5)
         return service
 
-    def FindCellularService(self, timeout=30):
+    def FindCellularService(self, timeout=DEFAULT_CELLULAR_TIMEOUT):
         return self._FindService(self.DEVICE_CELLULAR, timeout)
 
     def FindWimaxService(self, timeout=30):