From 2dff49174ca3ddb486e26d9ccd3a458e8451f5b5 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Tue, 24 Jul 2018 18:00:39 -0400 Subject: [PATCH 1/2] Adjust import path for WPT tests to accommodate upstream. --- tests/wpt/run.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/wpt/run.py b/tests/wpt/run.py index e77494ae46e..a65ba8d336a 100644 --- a/tests/wpt/run.py +++ b/tests/wpt/run.py @@ -22,7 +22,8 @@ def servo_path(*args): paths = {"include_manifest": wpt_path("include.ini"), "config": wpt_path("config.ini")} # Imports -sys.path.append(wpt_path("web-platform-tests", "tools", "wptrunner")) +sys.path.append(wpt_path("web-platform-tests", "tools")) +import localpaths from wptrunner import wptrunner, wptcommandline From 30f964e489902d5d260a9809dec672157b20eaf5 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Tue, 24 Jul 2018 18:06:30 -0400 Subject: [PATCH 2/2] Fix pyflakes warning. --- tests/wpt/run.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/wpt/run.py b/tests/wpt/run.py index a65ba8d336a..005da29b7e3 100644 --- a/tests/wpt/run.py +++ b/tests/wpt/run.py @@ -23,7 +23,7 @@ paths = {"include_manifest": wpt_path("include.ini"), "config": wpt_path("config.ini")} # Imports sys.path.append(wpt_path("web-platform-tests", "tools")) -import localpaths +import localpaths # noqa: flake8 from wptrunner import wptrunner, wptcommandline