From 619be736b19b693ccd703f4236fd07bbf7aae4ce Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Sat, 31 Aug 2019 15:31:57 -0400 Subject: [PATCH] Decode URI components when reporting testharness results. --- tests/wpt/metadata/MANIFEST.json | 2 +- .../xhr/xmlhttprequest-timeout-aborted.html.ini | 8 -------- .../xmlhttprequest-timeout-abortedonmain.html.ini | 5 ----- .../xhr/xmlhttprequest-timeout-overrides.html.ini | 8 -------- ...xmlhttprequest-timeout-overridesexpires.html.ini | 8 -------- .../xhr/xmlhttprequest-timeout-simple.html.ini | 8 -------- .../xhr/xmlhttprequest-timeout-synconmain.html.ini | 5 ----- .../xhr/xmlhttprequest-timeout-twice.html.ini | 8 -------- .../xmlhttprequest-timeout-worker-aborted.html.ini | 8 -------- ...xmlhttprequest-timeout-worker-overrides.html.ini | 8 -------- ...request-timeout-worker-overridesexpires.html.ini | 12 ------------ .../xmlhttprequest-timeout-worker-simple.html.ini | 8 -------- ...httprequest-timeout-worker-synconworker.html.ini | 13 +------------ .../xmlhttprequest-timeout-worker-twice.html.ini | 8 -------- .../wptrunner/wptrunner/testharnessreport-servo.js | 2 +- 15 files changed, 3 insertions(+), 108 deletions(-) delete mode 100644 tests/wpt/metadata/xhr/xmlhttprequest-timeout-aborted.html.ini delete mode 100644 tests/wpt/metadata/xhr/xmlhttprequest-timeout-abortedonmain.html.ini delete mode 100644 tests/wpt/metadata/xhr/xmlhttprequest-timeout-overrides.html.ini delete mode 100644 tests/wpt/metadata/xhr/xmlhttprequest-timeout-overridesexpires.html.ini delete mode 100644 tests/wpt/metadata/xhr/xmlhttprequest-timeout-simple.html.ini delete mode 100644 tests/wpt/metadata/xhr/xmlhttprequest-timeout-synconmain.html.ini delete mode 100644 tests/wpt/metadata/xhr/xmlhttprequest-timeout-twice.html.ini delete mode 100644 tests/wpt/metadata/xhr/xmlhttprequest-timeout-worker-aborted.html.ini delete mode 100644 tests/wpt/metadata/xhr/xmlhttprequest-timeout-worker-overrides.html.ini delete mode 100644 tests/wpt/metadata/xhr/xmlhttprequest-timeout-worker-overridesexpires.html.ini delete mode 100644 tests/wpt/metadata/xhr/xmlhttprequest-timeout-worker-simple.html.ini delete mode 100644 tests/wpt/metadata/xhr/xmlhttprequest-timeout-worker-twice.html.ini diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index 2843ff8414b..600a3ae82b1 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -689427,7 +689427,7 @@ "support" ], "tools/wptrunner/wptrunner/testharnessreport-servo.js": [ - "b672aea9a2540bf1446a23ddb288c93009bb26ba", + "a10b69df5504fab875147af26d925ebcce51ec00", "support" ], "tools/wptrunner/wptrunner/testharnessreport-servodriver.js": [ diff --git a/tests/wpt/metadata/xhr/xmlhttprequest-timeout-aborted.html.ini b/tests/wpt/metadata/xhr/xmlhttprequest-timeout-aborted.html.ini deleted file mode 100644 index 8ba4e89fbc1..00000000000 --- a/tests/wpt/metadata/xhr/xmlhttprequest-timeout-aborted.html.ini +++ /dev/null @@ -1,8 +0,0 @@ -[xmlhttprequest-timeout-aborted.html?only open()ed, not aborted] - expected: ERROR - -[xmlhttprequest-timeout-aborted.html?call abort() after TIME_NORMAL_LOAD] - expected: ERROR - -[xmlhttprequest-timeout-aborted.html?aborted immediately after send()] - expected: ERROR diff --git a/tests/wpt/metadata/xhr/xmlhttprequest-timeout-abortedonmain.html.ini b/tests/wpt/metadata/xhr/xmlhttprequest-timeout-abortedonmain.html.ini deleted file mode 100644 index 825f0ca3d0e..00000000000 --- a/tests/wpt/metadata/xhr/xmlhttprequest-timeout-abortedonmain.html.ini +++ /dev/null @@ -1,5 +0,0 @@ -[xmlhttprequest-timeout-abortedonmain.html?aborted after TIME_DELAY] - expected: ERROR - -[xmlhttprequest-timeout-abortedonmain.html?abort() from a 0ms timeout] - expected: ERROR diff --git a/tests/wpt/metadata/xhr/xmlhttprequest-timeout-overrides.html.ini b/tests/wpt/metadata/xhr/xmlhttprequest-timeout-overrides.html.ini deleted file mode 100644 index 8e515dce937..00000000000 --- a/tests/wpt/metadata/xhr/xmlhttprequest-timeout-overrides.html.ini +++ /dev/null @@ -1,8 +0,0 @@ -[xmlhttprequest-timeout-overrides.html?timeout disabled after initially set] - expected: ERROR - -[xmlhttprequest-timeout-overrides.html?timeout enabled after initially disabled] - expected: ERROR - -[xmlhttprequest-timeout-overrides.html?timeout overrides load after a delay] - expected: ERROR diff --git a/tests/wpt/metadata/xhr/xmlhttprequest-timeout-overridesexpires.html.ini b/tests/wpt/metadata/xhr/xmlhttprequest-timeout-overridesexpires.html.ini deleted file mode 100644 index 48a4ff29aa1..00000000000 --- a/tests/wpt/metadata/xhr/xmlhttprequest-timeout-overridesexpires.html.ini +++ /dev/null @@ -1,8 +0,0 @@ -[xmlhttprequest-timeout-overridesexpires.html?timeout set to expired value before load fires] - expected: ERROR - -[xmlhttprequest-timeout-overridesexpires.html?timeout set to non-expiring value after timeout fires] - expected: ERROR - -[xmlhttprequest-timeout-overridesexpires.html?timeout set to expiring value after load fires] - expected: ERROR diff --git a/tests/wpt/metadata/xhr/xmlhttprequest-timeout-simple.html.ini b/tests/wpt/metadata/xhr/xmlhttprequest-timeout-simple.html.ini deleted file mode 100644 index f69e99a091e..00000000000 --- a/tests/wpt/metadata/xhr/xmlhttprequest-timeout-simple.html.ini +++ /dev/null @@ -1,8 +0,0 @@ -[xmlhttprequest-timeout-simple.html?no time out scheduled, load fires normally] - expected: ERROR - -[xmlhttprequest-timeout-simple.html?load fires normally] - expected: ERROR - -[xmlhttprequest-timeout-simple.html?timeout hit before load] - expected: ERROR diff --git a/tests/wpt/metadata/xhr/xmlhttprequest-timeout-synconmain.html.ini b/tests/wpt/metadata/xhr/xmlhttprequest-timeout-synconmain.html.ini deleted file mode 100644 index be2c7e3d707..00000000000 --- a/tests/wpt/metadata/xhr/xmlhttprequest-timeout-synconmain.html.ini +++ /dev/null @@ -1,5 +0,0 @@ -[xmlhttprequest-timeout-synconmain.html?timeout after open] - expected: ERROR - -[xmlhttprequest-timeout-synconmain.html?timeout before open] - expected: ERROR diff --git a/tests/wpt/metadata/xhr/xmlhttprequest-timeout-twice.html.ini b/tests/wpt/metadata/xhr/xmlhttprequest-timeout-twice.html.ini deleted file mode 100644 index 2fbb8a5c787..00000000000 --- a/tests/wpt/metadata/xhr/xmlhttprequest-timeout-twice.html.ini +++ /dev/null @@ -1,8 +0,0 @@ -[xmlhttprequest-timeout-twice.html?load fires normally with same timeout set twice] - expected: ERROR - -[xmlhttprequest-timeout-twice.html?timeout fires normally with same timeout set twice] - expected: ERROR - -[xmlhttprequest-timeout-twice.html?load fires normally with no timeout set, twice] - expected: ERROR diff --git a/tests/wpt/metadata/xhr/xmlhttprequest-timeout-worker-aborted.html.ini b/tests/wpt/metadata/xhr/xmlhttprequest-timeout-worker-aborted.html.ini deleted file mode 100644 index 01231352ec2..00000000000 --- a/tests/wpt/metadata/xhr/xmlhttprequest-timeout-worker-aborted.html.ini +++ /dev/null @@ -1,8 +0,0 @@ -[xmlhttprequest-timeout-worker-aborted.html?call abort() after TIME_NORMAL_LOAD] - expected: ERROR - -[xmlhttprequest-timeout-worker-aborted.html?only open()ed, not aborted] - expected: ERROR - -[xmlhttprequest-timeout-worker-aborted.html?aborted immediately after send()] - expected: ERROR diff --git a/tests/wpt/metadata/xhr/xmlhttprequest-timeout-worker-overrides.html.ini b/tests/wpt/metadata/xhr/xmlhttprequest-timeout-worker-overrides.html.ini deleted file mode 100644 index efd20eaeeab..00000000000 --- a/tests/wpt/metadata/xhr/xmlhttprequest-timeout-worker-overrides.html.ini +++ /dev/null @@ -1,8 +0,0 @@ -[xmlhttprequest-timeout-worker-overrides.html?timeout overrides load after a delay] - expected: ERROR - -[xmlhttprequest-timeout-worker-overrides.html?timeout enabled after initially disabled] - expected: ERROR - -[xmlhttprequest-timeout-worker-overrides.html?timeout disabled after initially set] - expected: ERROR diff --git a/tests/wpt/metadata/xhr/xmlhttprequest-timeout-worker-overridesexpires.html.ini b/tests/wpt/metadata/xhr/xmlhttprequest-timeout-worker-overridesexpires.html.ini deleted file mode 100644 index 83e14760049..00000000000 --- a/tests/wpt/metadata/xhr/xmlhttprequest-timeout-worker-overridesexpires.html.ini +++ /dev/null @@ -1,12 +0,0 @@ -[xmlhttprequest-timeout-worker-overridesexpires.html] - type: testharness - disabled: racy test - -[xmlhttprequest-timeout-worker-overridesexpires.html?timeout set to expired value before load fires] - expected: ERROR - -[xmlhttprequest-timeout-worker-overridesexpires.html?timeout set to non-expiring value after timeout fires] - expected: ERROR - -[xmlhttprequest-timeout-worker-overridesexpires.html?timeout set to expiring value after load fires] - expected: ERROR diff --git a/tests/wpt/metadata/xhr/xmlhttprequest-timeout-worker-simple.html.ini b/tests/wpt/metadata/xhr/xmlhttprequest-timeout-worker-simple.html.ini deleted file mode 100644 index eb9e4a4cee6..00000000000 --- a/tests/wpt/metadata/xhr/xmlhttprequest-timeout-worker-simple.html.ini +++ /dev/null @@ -1,8 +0,0 @@ -[xmlhttprequest-timeout-worker-simple.html?load fires normally] - expected: ERROR - -[xmlhttprequest-timeout-worker-simple.html?timeout hit before load] - expected: ERROR - -[xmlhttprequest-timeout-worker-simple.html?no time out scheduled, load fires normally] - expected: ERROR diff --git a/tests/wpt/metadata/xhr/xmlhttprequest-timeout-worker-synconworker.html.ini b/tests/wpt/metadata/xhr/xmlhttprequest-timeout-worker-synconworker.html.ini index 73b2005ad6c..610b7a87783 100644 --- a/tests/wpt/metadata/xhr/xmlhttprequest-timeout-worker-synconworker.html.ini +++ b/tests/wpt/metadata/xhr/xmlhttprequest-timeout-worker-synconworker.html.ini @@ -1,14 +1,3 @@ -[xmlhttprequest-timeout-worker-synconworker.html] - type: testharness +[xmlhttprequest-timeout-worker-synconworker.html?timeout hit before load] [Timeout test: timeout hit before load, timeout scheduled at 2000] expected: FAIL - - -[xmlhttprequest-timeout-worker-synconworker.html?timeout hit before load] - expected: ERROR - -[xmlhttprequest-timeout-worker-synconworker.html?no time out scheduled, load fires normally] - expected: ERROR - -[xmlhttprequest-timeout-worker-synconworker.html?load fires normally] - expected: ERROR diff --git a/tests/wpt/metadata/xhr/xmlhttprequest-timeout-worker-twice.html.ini b/tests/wpt/metadata/xhr/xmlhttprequest-timeout-worker-twice.html.ini deleted file mode 100644 index 5b564cb721c..00000000000 --- a/tests/wpt/metadata/xhr/xmlhttprequest-timeout-worker-twice.html.ini +++ /dev/null @@ -1,8 +0,0 @@ -[xmlhttprequest-timeout-worker-twice.html?load fires normally with same timeout set twice] - expected: ERROR - -[xmlhttprequest-timeout-worker-twice.html?load fires normally with no timeout set, twice] - expected: ERROR - -[xmlhttprequest-timeout-worker-twice.html?timeout fires normally with same timeout set twice] - expected: ERROR diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testharnessreport-servo.js b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testharnessreport-servo.js index b672aea9a25..a10b69df550 100644 --- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testharnessreport-servo.js +++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testharnessreport-servo.js @@ -4,7 +4,7 @@ start_loc.href = location.href; setup(props); add_completion_callback(function (tests, harness_status) { - var id = start_loc.pathname + start_loc.search + start_loc.hash; + var id = decodeURIComponent(start_loc.pathname) + decodeURIComponent(start_loc.search) + decodeURIComponent(start_loc.hash); console.log("ALERT: RESULT: " + JSON.stringify([ id, harness_status.status,