Bug 1301598 - Fix test_ssl_disabled_error_page.py to timeout after 30s for the page load draft
authorHenrik Skupin <mail@hskupin.info>
Fri, 09 Sep 2016 10:12:07 +0200
changeset 412056 294a568f2ec7ed89a55a4c30dbfbceaa3c3df854
parent 411657 938ce16be25f9c551c19ef8938e8717ed3d41ff5
child 530867 8805006178d5f85b0e471991830d7863f4b269ac
push id29040
push userbmo:hskupin@gmail.com
push dateFri, 09 Sep 2016 08:13:20 +0000
bugs1301598
milestone51.0a1
Bug 1301598 - Fix test_ssl_disabled_error_page.py to timeout after 30s for the page load MozReview-Commit-ID: EeNRLb2EzVI
testing/firefox-ui/tests/functional/security/test_ssl_disabled_error_page.py
--- a/testing/firefox-ui/tests/functional/security/test_ssl_disabled_error_page.py
+++ b/testing/firefox-ui/tests/functional/security/test_ssl_disabled_error_page.py
@@ -44,10 +44,10 @@ class TestSSLDisabledErrorPage(FirefoxTe
                           short_description.get_property('textContent'))
             self.assertIn('mozqa.com', short_description.get_property('textContent'))
 
             # Verify that the "Restore" button appears and works
             reset_button = self.marionette.find_element(By.ID, 'prefResetButton')
             reset_button.click()
 
             # With the preferences reset, the page has to load correctly
-            Wait(self.marionette).until(expected.element_present(By.LINK_TEXT,
-                                                                 'http://quality.mozilla.org'))
+            Wait(self.marionette, timeout=self.browser.timeout_page_load).until(
+                expected.element_present(By.LINK_TEXT, 'http://quality.mozilla.org'))