Allow tools to be wpt_tools for csswg-test

The Servo driver change is okay because we're guaranteed to have tools on the Python path by the point this gets run
w3c · Jan 26, 2017 · 7c580f9 · 7c580f9
1 parent 0138119
commit 7c580f9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/wptrunner/environment.py b/wptrunner/environment.py
@@ -38,6 +38,8 @@ def do_delayed_imports(logger, test_paths):
 
     try:
         from tools.serve import serve
+    except ImportError:
+        from wpt_tools.serve import serve
     except ImportError:
         failed.append("serve")
 

diff --git a/wptrunner/executors/executorservodriver.py b/wptrunner/executors/executorservodriver.py
@@ -25,7 +25,7 @@
 
 def do_delayed_imports():
     global webdriver
-    from tools import webdriver
+    import webdriver
 
 
 class ServoWebDriverProtocol(Protocol):

diff --git a/wptrunner/update/update.py b/wptrunner/update/update.py
@@ -15,7 +15,10 @@
 
 def setup_paths(sync_path):
     sys.path.insert(0, os.path.abspath(sync_path))
-    from tools import localpaths
+    try:
+        from tools import localpaths
+    except ImportError:
+        from wpt_tools import localpaths
 
 class LoadConfig(Step):
     """Step for loading configuration from the ini file and kwargs."""