Bug 1316622 - Move microformats Marionete tests to new timeouts API; r?whimboo
MozReview-Commit-ID: Gjd0n3DqYSE
--- 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):