Merge remote-tracking branch 'zacc/inc_timeouts'

malini · Dec 5, 2012 · 50ad883 · 50ad883
2 parents 52241eb + 66f463f
commit 50ad883
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/gaiatest/tests/test_browser_cell_data.py b/gaiatest/tests/test_browser_cell_data.py
@@ -35,7 +35,7 @@ def test_browser_cell_data(self):
         self.marionette.find_element(*self._url_button_locator).click()
 
         # Bump up the timeout due to slower cell data speeds
-        self.wait_for_condition(lambda m: not self.is_throbber_visible(), timeout=20)
+        self.wait_for_condition(lambda m: not self.is_throbber_visible(), timeout=40)
 
         browser_frame = self.marionette.find_element(
             *self._browser_frame_locator)

diff --git a/gaiatest/tests/test_dialer.py b/gaiatest/tests/test_dialer.py
@@ -56,15 +56,15 @@ def test_dialer_make_call(self):
         self.marionette.switch_to_frame()
 
         # Wait for call screen then switch to it
-        self.wait_for_element_present(*self._call_screen_locator)
+        self.wait_for_element_present(*self._call_screen_locator, timeout=30)
         call_screen = self.marionette.find_element(*self._call_screen_locator)
         self.marionette.switch_to_frame(call_screen)
 
         # Wait for call screen to be dialing
         self.wait_for_element_displayed(*self._outgoing_call_locator)
 
         # Wait for the state to get to 'alerting' which means connection made
-        self.wait_for_condition(lambda m: self.data_layer.active_telephony_state == "alerting", timeout=20)
+        self.wait_for_condition(lambda m: self.data_layer.active_telephony_state == "alerting", timeout=30)
 
         # Check the number displayed is the one we dialed
         self.assertEqual(self._test_phone_number,