Bug 1107336: Update b2g desktop imports to use marionette driver; r=ahal
☠☠ backed out by fe79362ffaaf ☠ ☠
authorDavid Burns <dburns@mozilla.com>
Mon, 26 Jan 2015 14:07:28 +0000
changeset 255798 a07bb95eb20934c25a0e3d121c804f5867203e5b
parent 255797 49b400b2463f74d2b6e9d89b58429074427970f8
child 255799 9c4b171c23bec3b49032b82f5b468c9f07c9aecd
push id4610
push userjlund@mozilla.com
push dateMon, 30 Mar 2015 18:32:55 +0000
treeherdermozilla-beta@4df54044d9ef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersahal
bugs1107336
milestone38.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1107336: Update b2g desktop imports to use marionette driver; r=ahal
layout/tools/reftest/b2g_desktop.py
--- a/layout/tools/reftest/b2g_desktop.py
+++ b/layout/tools/reftest/b2g_desktop.py
@@ -6,19 +6,21 @@ from __future__ import print_function, u
 import os
 import signal
 import sys
 
 here = os.path.abspath(os.path.dirname(__file__))
 
 from runreftest import RefTest, ReftestOptions
 
-from marionette import Marionette, expected
-from marionette.wait import Wait
-from marionette.by import By
+from marionette_driver import expected
+from marionette_driver.by import By
+from marionette_driver.marionette import Marionette
+from marionette_driver.wait import Wait
+
 from mozprocess import ProcessHandler
 from mozrunner import FirefoxRunner
 import mozinfo
 import mozlog
 
 log = mozlog.getLogger('REFTEST')
 
 class B2GDesktopReftest(RefTest):