Fixup test changes
authorJames Graham <james@hoppipolla.co.uk>
Wed, 13 May 2015 22:02:20 +0100
changeset 326807 7b15f1197fbd98850f12dd176253c9c60b1aafcf
parent 326806 df7a9f4648cfc133d9cbed40fc6af9ae4409968b
child 326808 b315fdd69b545f11a72e0a8c68d5b011c4afe86c
push id10169
push userdminor@mozilla.com
push dateThu, 28 Jan 2016 13:10:48 +0000
milestone41.0a1
Fixup test changes
testing/web-platform/meta/MANIFEST.json
testing/web-platform/tests/eventsource/eventsource-request-cancellation.htm
testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-connecting.html
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -19731,815 +19731,16 @@
     "items": {
       "testharness": {
         "encoding/api-invalid-label.html": [
           {
             "path": "encoding/api-invalid-label.html",
             "timeout": "long",
             "url": "/encoding/api-invalid-label.html"
           }
-        ],
-        "html/syntax/parsing/html5lib_adoption01.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_adoption01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_adoption01.html?run_type=write_single"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_adoption01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_adoption01.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_adoption01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_adoption01.html?run_type=write"
-          }
-        ],
-        "html/syntax/parsing/html5lib_adoption02.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_adoption02.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_adoption02.html?run_type=write_single"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_adoption02.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_adoption02.html?run_type=write"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_adoption02.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_adoption02.html?run_type=uri"
-          }
-        ],
-        "html/syntax/parsing/html5lib_comments01.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_comments01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_comments01.html?run_type=write_single"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_comments01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_comments01.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_comments01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_comments01.html?run_type=write"
-          }
-        ],
-        "html/syntax/parsing/html5lib_doctype01.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_doctype01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_doctype01.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_doctype01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_doctype01.html?run_type=write_single"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_doctype01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_doctype01.html?run_type=write"
-          }
-        ],
-        "html/syntax/parsing/html5lib_domjs-unsafe.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_domjs-unsafe.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_domjs-unsafe.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_domjs-unsafe.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_domjs-unsafe.html?run_type=write_single"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_domjs-unsafe.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_domjs-unsafe.html?run_type=write"
-          }
-        ],
-        "html/syntax/parsing/html5lib_entities01.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_entities01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_entities01.html?run_type=write"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_entities01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_entities01.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_entities01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_entities01.html?run_type=write_single"
-          }
-        ],
-        "html/syntax/parsing/html5lib_entities02.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_entities02.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_entities02.html?run_type=write_single"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_entities02.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_entities02.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_entities02.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_entities02.html?run_type=write"
-          }
-        ],
-        "html/syntax/parsing/html5lib_html5test-com.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_html5test-com.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_html5test-com.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_html5test-com.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_html5test-com.html?run_type=write"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_html5test-com.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_html5test-com.html?run_type=write_single"
-          }
-        ],
-        "html/syntax/parsing/html5lib_inbody01.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_inbody01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_inbody01.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_inbody01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_inbody01.html?run_type=write_single"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_inbody01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_inbody01.html?run_type=write"
-          }
-        ],
-        "html/syntax/parsing/html5lib_isindex.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_isindex.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_isindex.html?run_type=write_single"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_isindex.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_isindex.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_isindex.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_isindex.html?run_type=write"
-          }
-        ],
-        "html/syntax/parsing/html5lib_main-element.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_main-element.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_main-element.html?run_type=write"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_main-element.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_main-element.html?run_type=write_single"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_main-element.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_main-element.html?run_type=uri"
-          }
-        ],
-        "html/syntax/parsing/html5lib_pending-spec-changes-plain-text-unsafe.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_pending-spec-changes-plain-text-unsafe.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_pending-spec-changes-plain-text-unsafe.html?run_type=write_single"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_pending-spec-changes-plain-text-unsafe.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_pending-spec-changes-plain-text-unsafe.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_pending-spec-changes-plain-text-unsafe.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_pending-spec-changes-plain-text-unsafe.html?run_type=write"
-          }
-        ],
-        "html/syntax/parsing/html5lib_pending-spec-changes.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_pending-spec-changes.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_pending-spec-changes.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_pending-spec-changes.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_pending-spec-changes.html?run_type=write_single"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_pending-spec-changes.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_pending-spec-changes.html?run_type=write"
-          }
-        ],
-        "html/syntax/parsing/html5lib_plain-text-unsafe.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_plain-text-unsafe.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_plain-text-unsafe.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_plain-text-unsafe.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_plain-text-unsafe.html?run_type=write_single"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_plain-text-unsafe.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_plain-text-unsafe.html?run_type=write"
-          }
-        ],
-        "html/syntax/parsing/html5lib_scriptdata01.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_scriptdata01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_scriptdata01.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_scriptdata01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_scriptdata01.html?run_type=write"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_scriptdata01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_scriptdata01.html?run_type=write_single"
-          }
-        ],
-        "html/syntax/parsing/html5lib_scripted_adoption01.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_scripted_adoption01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_scripted_adoption01.html?run_type=write_single"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_scripted_adoption01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_scripted_adoption01.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_scripted_adoption01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_scripted_adoption01.html?run_type=write"
-          }
-        ],
-        "html/syntax/parsing/html5lib_scripted_ark.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_scripted_ark.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_scripted_ark.html?run_type=write_single"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_scripted_ark.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_scripted_ark.html?run_type=write"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_scripted_ark.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_scripted_ark.html?run_type=uri"
-          }
-        ],
-        "html/syntax/parsing/html5lib_scripted_webkit01.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_scripted_webkit01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_scripted_webkit01.html?run_type=write_single"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_scripted_webkit01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_scripted_webkit01.html?run_type=write"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_scripted_webkit01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_scripted_webkit01.html?run_type=uri"
-          }
-        ],
-        "html/syntax/parsing/html5lib_tables01.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_tables01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tables01.html?run_type=write"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tables01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tables01.html?run_type=write_single"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tables01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tables01.html?run_type=uri"
-          }
-        ],
-        "html/syntax/parsing/html5lib_template.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_template.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_template.html?run_type=write"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_template.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_template.html?run_type=write_single"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_template.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_template.html?run_type=uri"
-          }
-        ],
-        "html/syntax/parsing/html5lib_tests1.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_tests1.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests1.html?run_type=write"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests1.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests1.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests1.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests1.html?run_type=write_single"
-          }
-        ],
-        "html/syntax/parsing/html5lib_tests10.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_tests10.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests10.html?run_type=write_single"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests10.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests10.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests10.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests10.html?run_type=write"
-          }
-        ],
-        "html/syntax/parsing/html5lib_tests11.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_tests11.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests11.html?run_type=write"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests11.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests11.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests11.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests11.html?run_type=write_single"
-          }
-        ],
-        "html/syntax/parsing/html5lib_tests12.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_tests12.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests12.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests12.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests12.html?run_type=write"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests12.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests12.html?run_type=write_single"
-          }
-        ],
-        "html/syntax/parsing/html5lib_tests14.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_tests14.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests14.html?run_type=write_single"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests14.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests14.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests14.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests14.html?run_type=write"
-          }
-        ],
-        "html/syntax/parsing/html5lib_tests15.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_tests15.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests15.html?run_type=write_single"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests15.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests15.html?run_type=write"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests15.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests15.html?run_type=uri"
-          }
-        ],
-        "html/syntax/parsing/html5lib_tests16.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_tests16.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests16.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests16.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests16.html?run_type=write"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests16.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests16.html?run_type=write_single"
-          }
-        ],
-        "html/syntax/parsing/html5lib_tests17.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_tests17.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests17.html?run_type=write"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests17.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests17.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests17.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests17.html?run_type=write_single"
-          }
-        ],
-        "html/syntax/parsing/html5lib_tests18.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_tests18.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests18.html?run_type=write_single"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests18.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests18.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests18.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests18.html?run_type=write"
-          }
-        ],
-        "html/syntax/parsing/html5lib_tests19.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_tests19.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests19.html?run_type=write"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests19.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests19.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests19.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests19.html?run_type=write_single"
-          }
-        ],
-        "html/syntax/parsing/html5lib_tests2.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_tests2.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests2.html?run_type=write_single"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests2.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests2.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests2.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests2.html?run_type=write"
-          }
-        ],
-        "html/syntax/parsing/html5lib_tests20.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_tests20.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests20.html?run_type=write_single"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests20.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests20.html?run_type=write"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests20.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests20.html?run_type=uri"
-          }
-        ],
-        "html/syntax/parsing/html5lib_tests21.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_tests21.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests21.html?run_type=write_single"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests21.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests21.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests21.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests21.html?run_type=write"
-          }
-        ],
-        "html/syntax/parsing/html5lib_tests22.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_tests22.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests22.html?run_type=write"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests22.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests22.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests22.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests22.html?run_type=write_single"
-          }
-        ],
-        "html/syntax/parsing/html5lib_tests23.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_tests23.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests23.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests23.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests23.html?run_type=write"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests23.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests23.html?run_type=write_single"
-          }
-        ],
-        "html/syntax/parsing/html5lib_tests24.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_tests24.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests24.html?run_type=write"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests24.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests24.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests24.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests24.html?run_type=write_single"
-          }
-        ],
-        "html/syntax/parsing/html5lib_tests25.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_tests25.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests25.html?run_type=write_single"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests25.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests25.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests25.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests25.html?run_type=write"
-          }
-        ],
-        "html/syntax/parsing/html5lib_tests26.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_tests26.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests26.html?run_type=write_single"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests26.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests26.html?run_type=write"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests26.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests26.html?run_type=uri"
-          }
-        ],
-        "html/syntax/parsing/html5lib_tests3.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_tests3.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests3.html?run_type=write_single"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests3.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests3.html?run_type=write"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests3.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests3.html?run_type=uri"
-          }
-        ],
-        "html/syntax/parsing/html5lib_tests5.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_tests5.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests5.html?run_type=write_single"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests5.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests5.html?run_type=write"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests5.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests5.html?run_type=uri"
-          }
-        ],
-        "html/syntax/parsing/html5lib_tests6.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_tests6.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests6.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests6.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests6.html?run_type=write"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests6.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests6.html?run_type=write_single"
-          }
-        ],
-        "html/syntax/parsing/html5lib_tests7.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_tests7.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests7.html?run_type=write"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests7.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests7.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests7.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests7.html?run_type=write_single"
-          }
-        ],
-        "html/syntax/parsing/html5lib_tests8.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_tests8.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests8.html?run_type=write_single"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests8.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests8.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests8.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests8.html?run_type=write"
-          }
-        ],
-        "html/syntax/parsing/html5lib_tests9.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_tests9.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests9.html?run_type=write"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests9.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests9.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tests9.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tests9.html?run_type=write_single"
-          }
-        ],
-        "html/syntax/parsing/html5lib_tricky01.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_tricky01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tricky01.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tricky01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tricky01.html?run_type=write_single"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_tricky01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_tricky01.html?run_type=write"
-          }
-        ],
-        "html/syntax/parsing/html5lib_webkit01.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_webkit01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_webkit01.html?run_type=uri"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_webkit01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_webkit01.html?run_type=write_single"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_webkit01.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_webkit01.html?run_type=write"
-          }
-        ],
-        "html/syntax/parsing/html5lib_webkit02.html": [
-          {
-            "path": "html/syntax/parsing/html5lib_webkit02.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_webkit02.html?run_type=write"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_webkit02.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_webkit02.html?run_type=write_single"
-          },
-          {
-            "path": "html/syntax/parsing/html5lib_webkit02.html",
-            "timeout": "long",
-            "url": "/html/syntax/parsing/html5lib_webkit02.html?run_type=uri"
-          }
         ]
       }
     },
     "reftest_nodes": {}
   },
   "reftest_nodes": {
     "2dcontext/building-paths/canvas_complexshapes_arcto_001.htm": [
       {
@@ -25652,9 +24853,9 @@
         ],
         "url": "/webvtt/rendering/cues-with-video/processing-model/too_many_cues_wrapped.html"
       }
     ]
   },
   "rev": "5aa79b303c81164549041d1bd9f7887390a10f72",
   "url_base": "/",
   "version": 2
-}
\ No newline at end of file
+}
--- a/testing/web-platform/tests/eventsource/eventsource-request-cancellation.htm
+++ b/testing/web-platform/tests/eventsource/eventsource-request-cancellation.htm
@@ -4,33 +4,33 @@
     <title>EventSource: request cancellation</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
   </head>
   <body>
     <div id="log"></div>
     <script>
       t = async_test();
-      onload = t.step_func(function {
+      onload = t.step_func(function() {
         var url = "resources/message.py?sleep=1000&message=" + encodeURIComponent("retry:1000\ndata:abc\n\n");
         var es = new EventSource(url);
         var got_error = false;
-        es.onmessage = t.unreached_func("Got message after closing source");
         es.onerror = t.step_func(function() {
           got_error = true;
-          assertEquals(es.readyState, EventSource.CLOSED)
+          assert_equals(es.readyState, EventSource.CLOSED)
         });
 
-        window.stop();
+        setTimeout(function() {
+            window.stop()
+            es.onopen = t.unreached_func("Got open event");
+            es.onmessage = t.unreached_func("Got message after closing source");
+        }, 0);
 
-        es.onopen = t.step_func(function () {
-          assert_false(got_error);
-          setTimeout(t.step_func_done(function () {
-            assertEquals(es.readyState, EventSource.CLOSED,
-                         "After stopping the eventsource readyState should be CLOSED")
-            assert_true(got_error, "Error event should have fired");
-          }), 4000);
-          es.onopen = t.unreached_func("Got second open event");
-        });
+        setTimeout(t.step_func(function () {
+          assert_equals(es.readyState, EventSource.CLOSED,
+                        "After stopping the eventsource readyState should be CLOSED")
+          assert_true(got_error, "Error event should have fired");
+          t.done();
+        }), 4000);
       });
     </script>
   </body>
 </html>
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-connecting.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-connecting.html
@@ -13,10 +13,9 @@ setTimeout(function() {
   assert_equals(ws.readyState, ws.CLOSING);
   ws.onclose = function(e) {
     assert_equals(ws.readyState, ws.CLOSED);
     assert_equals(e.wasClean, false);
     done();
   };
 }, 1000);
 ws.onopen = ws.onclose = assert_unreached;
-};
 </script>