Bug 1401510 - Remove fallback imports for marionette driver in wpt-runner. draft
authorHenrik Skupin <mail@hskupin.info>
Wed, 20 Sep 2017 13:54:34 +0200
changeset 667614 2eca43a158e90be6e1617cd68f2621a7b336f3bd
parent 667613 471bbfcc18f37569a2b79e5e4b3fe5b8e7d95869
child 732444 e2e14c917790153bb774fafcba6bb0377f15d067
push id80776
push userbmo:hskupin@gmail.com
push dateWed, 20 Sep 2017 11:56:00 +0000
bugs1401510
milestone57.0a1
Bug 1401510 - Remove fallback imports for marionette driver in wpt-runner. The renaming of the package has been done ages ago, and no-one should use a version of Marionette driver which is that old anymore. MozReview-Commit-ID: J70fY0CVbbn
testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executormarionette.py
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executormarionette.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executormarionette.py
@@ -24,27 +24,20 @@ from .base import (ExecutorException,
                    testharness_result_converter,
                    reftest_result_converter,
                    strip_server)
 
 from ..testrunner import Stop
 from ..webdriver_server import GeckoDriverServer
 
 
-
 def do_delayed_imports():
     global errors, marionette
 
-    # Marionette client used to be called marionette, recently it changed
-    # to marionette_driver for unfathomable reasons
-    try:
-        import marionette
-        from marionette import errors
-    except ImportError:
-        from marionette_driver import marionette, errors
+    from marionette_driver import marionette, errors
 
 
 class MarionetteProtocol(Protocol):
     def __init__(self, executor, browser, timeout_multiplier=1):
         do_delayed_imports()
 
         Protocol.__init__(self, executor, browser)
         self.marionette = None