From 6d8650078a7980f3ce005dd3c309a17f60921fb1 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Thu, 15 Feb 2018 11:37:06 +0100 Subject: [PATCH] Fix an error in executorservo.py ``` TypeError: make_hosts_file() takes exactly 2 arguments (0 given) ``` --- .../css/CSS2/floats/intrinsic-size-float-and-line.html.ini | 2 ++ .../wpt/metadata/css/CSS2/visudet/content-height-005.html.ini | 2 ++ .../attachment-local-clipping-color-4.html.ini | 2 +- tests/wpt/metadata/css/css-fonts/font-variant-05.xht.ini | 2 ++ tests/wpt/metadata/css/css-fonts/font-variant-06.xht.ini | 2 ++ .../css/mediaqueries/viewport-script-dynamic.html.ini | 2 ++ .../fetch/corb/img-html-correctly-labeled.sub.html.ini | 2 ++ .../opening-the-input-stream/010.html.ini | 4 ++++ .../tools/wptrunner/wptrunner/executors/executorservo.py | 2 +- 9 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 tests/wpt/metadata/css/CSS2/floats/intrinsic-size-float-and-line.html.ini create mode 100644 tests/wpt/metadata/css/CSS2/visudet/content-height-005.html.ini create mode 100644 tests/wpt/metadata/css/css-fonts/font-variant-05.xht.ini create mode 100644 tests/wpt/metadata/css/css-fonts/font-variant-06.xht.ini create mode 100644 tests/wpt/metadata/css/mediaqueries/viewport-script-dynamic.html.ini create mode 100644 tests/wpt/metadata/fetch/corb/img-html-correctly-labeled.sub.html.ini create mode 100644 tests/wpt/metadata/html/dom/dynamic-markup-insertion/opening-the-input-stream/010.html.ini diff --git a/tests/wpt/metadata/css/CSS2/floats/intrinsic-size-float-and-line.html.ini b/tests/wpt/metadata/css/CSS2/floats/intrinsic-size-float-and-line.html.ini new file mode 100644 index 00000000000..1ceb10406aa --- /dev/null +++ b/tests/wpt/metadata/css/CSS2/floats/intrinsic-size-float-and-line.html.ini @@ -0,0 +1,2 @@ +[intrinsic-size-float-and-line.html] + expected: FAIL diff --git a/tests/wpt/metadata/css/CSS2/visudet/content-height-005.html.ini b/tests/wpt/metadata/css/CSS2/visudet/content-height-005.html.ini new file mode 100644 index 00000000000..325319d1ea5 --- /dev/null +++ b/tests/wpt/metadata/css/CSS2/visudet/content-height-005.html.ini @@ -0,0 +1,2 @@ +[content-height-005.html] + expected: FAIL diff --git a/tests/wpt/metadata/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-4.html.ini b/tests/wpt/metadata/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-4.html.ini index f5a2c566bf9..de5eaf2f86f 100644 --- a/tests/wpt/metadata/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-4.html.ini +++ b/tests/wpt/metadata/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-4.html.ini @@ -1,3 +1,3 @@ [attachment-local-clipping-color-4.html] type: reftest - expected: TIMEOUT + expected: FAIL diff --git a/tests/wpt/metadata/css/css-fonts/font-variant-05.xht.ini b/tests/wpt/metadata/css/css-fonts/font-variant-05.xht.ini new file mode 100644 index 00000000000..5f6453302fb --- /dev/null +++ b/tests/wpt/metadata/css/css-fonts/font-variant-05.xht.ini @@ -0,0 +1,2 @@ +[font-variant-05.xht] + expected: FAIL diff --git a/tests/wpt/metadata/css/css-fonts/font-variant-06.xht.ini b/tests/wpt/metadata/css/css-fonts/font-variant-06.xht.ini new file mode 100644 index 00000000000..1f51f93c4b7 --- /dev/null +++ b/tests/wpt/metadata/css/css-fonts/font-variant-06.xht.ini @@ -0,0 +1,2 @@ +[font-variant-06.xht] + expected: FAIL diff --git a/tests/wpt/metadata/css/mediaqueries/viewport-script-dynamic.html.ini b/tests/wpt/metadata/css/mediaqueries/viewport-script-dynamic.html.ini new file mode 100644 index 00000000000..bb7a26f177c --- /dev/null +++ b/tests/wpt/metadata/css/mediaqueries/viewport-script-dynamic.html.ini @@ -0,0 +1,2 @@ +[viewport-script-dynamic.html] + expected: FAIL diff --git a/tests/wpt/metadata/fetch/corb/img-html-correctly-labeled.sub.html.ini b/tests/wpt/metadata/fetch/corb/img-html-correctly-labeled.sub.html.ini new file mode 100644 index 00000000000..a3ca93e9771 --- /dev/null +++ b/tests/wpt/metadata/fetch/corb/img-html-correctly-labeled.sub.html.ini @@ -0,0 +1,2 @@ +[img-html-correctly-labeled.sub.html] + expected: FAIL diff --git a/tests/wpt/metadata/html/dom/dynamic-markup-insertion/opening-the-input-stream/010.html.ini b/tests/wpt/metadata/html/dom/dynamic-markup-insertion/opening-the-input-stream/010.html.ini new file mode 100644 index 00000000000..33164945eb6 --- /dev/null +++ b/tests/wpt/metadata/html/dom/dynamic-markup-insertion/opening-the-input-stream/010.html.ini @@ -0,0 +1,4 @@ +[010.html] + [Salvagability of document.opened document] + expected: FAIL + diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservo.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservo.py index 3cf402d481f..edacdddf4d9 100644 --- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservo.py +++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservo.py @@ -185,7 +185,7 @@ class ServoRefTestExecutor(ProcessTestExecutor): self.screenshot_cache = screenshot_cache self.implementation = RefTestImplementation(self) self.tempdir = tempfile.mkdtemp() - self.hosts_path = make_hosts_file() + self.hosts_path = write_hosts_file(server_config) def teardown(self): try: