Bug 1316622 - Move microformats Marionete tests to new timeouts API; r=whimboo
authorAndreas Tolfsen <ato@mozilla.com>
Thu, 10 Nov 2016 21:04:46 +0000
changeset 323986 509ad050bea4d5758c60e4c88540738dbca3e243
parent 323985 e3acbc950e1ca302f02a1ac058ff633e0c5a1d5a
child 323987 27bf0458f5cf02b3adbb66f5e149225de7fc7390
push id24
push usermaklebus@msu.edu
push dateTue, 20 Dec 2016 03:11:33 +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):