Merge pull request #70 from AutomatedTester/marionette_imports

Update marionette imports to align with upcoming changes to mozilla-cental
web-platform-tests · Jan 28, 2015 · e9ec97a · e9ec97a
2 parents ba238b3 + 1f3f1c3
commit e9ec97a
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/wptrunner/executors/executormarionette.py b/wptrunner/executors/executormarionette.py
@@ -30,7 +30,10 @@
 
 def do_delayed_imports():
     global marionette
-    import marionette
+    try:
+        import marionette
+    except ImportError:
+        import marionette_driver.marionette as marionette
 
 
 class MarionetteTestExecutor(TestExecutor):