Bug 1316622 - Move microformats Marionete tests to new timeouts API; r?whimboo draft
authorAndreas Tolfsen <ato@mozilla.com>
Thu, 10 Nov 2016 21:04:46 +0000
changeset 442875 e0550f8e8c5d8e50bed0df65606c9f068bda6695
parent 442874 14323b58a072c4e9db9486658779d56084e45df1
child 442876 3f80ef0adb0db1ed0cb65c0ced08fdeedd42a8b3
push id36854
push userbmo:ato@mozilla.com
push dateWed, 23 Nov 2016 13:38:54 +0000
reviewerswhimboo
bugs1316622
milestone53.0a1
Bug 1316622 - Move microformats Marionete tests to new timeouts API; r?whimboo MozReview-Commit-ID: Gjd0n3DqYSE
toolkit/components/microformats/test/marionette/microformats_tester.py
--- a/toolkit/components/microformats/test/marionette/microformats_tester.py
+++ b/toolkit/components/microformats/test/marionette/microformats_tester.py
@@ -95,19 +95,19 @@ class BaseTestFrontendUnits(MarionetteTe
         # Note: when e10s is enabled by default, this pref can go away. The automatic
         # restart will also go away if this is still the only pref set here.
         self.marionette.enforce_gecko_prefs({
             "browser.tabs.remote.autostart": True
         })
 
         # This extends the timeout for find_element. We need this as the tests
         # take an amount of time to run after loading, which we have to wait for.
-        self.marionette.set_search_timeout(120000)
+        self.marionette.timeout.implicit = 120
 
-        self.marionette.set_page_load_timeout(120000)
+        self.marionette.timeout.page_load = 120
 
     # srcdir_path should be the directory relative to this file.
     def set_server_prefix(self, srcdir_path):
         self.server_prefix = urlparse.urljoin("http://localhost:" + str(self.port),
                                               srcdir_path)
 
     def check_page(self, page):