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
--- 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