Bug 1322772 - Avoid using infinite page load timeout; r=maja_zf,whimboo a=test-only
authorAndreas Tolfsen <ato@mozilla.com>
Fri, 09 Dec 2016 14:37:41 -1000
changeset 353316 d01aa3ae2908a2882dbcc71c7e3b26ee74900526
parent 353315 20c1ed9c6d76e6bfff8eac616305fbda059acc2c
child 353317 218db8b47b80de47bf6fe624aea9c545a3e01e4e
push id6795
push userjlund@mozilla.com
push dateMon, 23 Jan 2017 14:19:46 +0000
treeherdermozilla-esr52@76101b503191 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmaja_zf, whimboo, test-only
bugs1322772
milestone52.0a2
Bug 1322772 - Avoid using infinite page load timeout; r=maja_zf,whimboo a=test-only Giving the value 0 indicates we should wait forever for the page load to finish. This change significantly speeds up the tests. MozReview-Commit-ID: 8hvqxGNR7B7
testing/marionette/harness/marionette_harness/tests/unit/test_navigation.py
--- a/testing/marionette/harness/marionette_harness/tests/unit/test_navigation.py
+++ b/testing/marionette/harness/marionette_harness/tests/unit/test_navigation.py
@@ -130,17 +130,17 @@ class TestNavigate(WindowManagerMixin, M
         self.marionette.navigate(self.test_doc)
         state = self.marionette.execute_script(
             "return window.document.readyState")
         self.assertEqual("complete", state)
         self.assertTrue(self.marionette.find_element(By.ID, "mozLink"))
 
     def test_error_when_exceeding_page_load_timeout(self):
         with self.assertRaises(errors.TimeoutException):
-            self.marionette.timeout.page_load = 0
+            self.marionette.timeout.page_load = 0.1
             self.marionette.navigate(self.marionette.absolute_url("slow"))
             self.marionette.find_element(By.TAG_NAME, "p")
 
     def test_navigate_iframe(self):
         self.marionette.navigate(self.iframe_doc)
         self.assertTrue('test_iframe.html' in self.marionette.get_url())
         self.assertTrue(self.marionette.find_element(By.ID, "test_iframe"))