Merge pull request #2958 from Ms2ger/update-wpt

Update web-platform-tests; r=Manishearth

src/test/wpt/metadata/XMLHttpRequest/abort-upload-event-abort.htm.ini

@@ -1,5 +0,0 @@
-[abort-upload-event-abort.htm]
-  type: testharness
-  [XMLHttpRequest: The abort() method: Fire a progress event named abort on the XMLHttpRequestUpload object]
-    expected: FAIL
-

src/test/wpt/metadata/XMLHttpRequest/progress-events-response-data-gzip.htm.ini

@@ -0,0 +1,5 @@
+[progress-events-response-data-gzip.htm]
+  type: testharness
+  [XMLHttpRequest: progress events and GZIP encoding]
+    expected: FAIL
+

src/test/wpt/metadata/XMLHttpRequest/response-data-deflate.htm.ini

@@ -0,0 +1,5 @@
+[response-data-deflate.htm]
+  type: testharness
+  [XMLHttpRequest: content-encoding:deflate response was correctly inflated]
+    expected: FAIL
+

src/test/wpt/metadata/XMLHttpRequest/responsetext-decoding.htm.ini

@@ -1,32 +1,3 @@
 [responsetext-decoding.htm]
   type: testharness
-  [XMLHttpRequest: responseText decoding (text/plain %FE%FF)]
+  disabled: flaky
-    expected: FAIL
-
-  [XMLHttpRequest: responseText decoding (text/plain %FE%FF%FE%FF)]
-    expected: FAIL
-
-  [XMLHttpRequest: responseText decoding (text/plain %EF%BB%BF)]
-    expected: FAIL
-
-  [XMLHttpRequest: responseText decoding (text/plain %EF%BB%BF%EF%BB%BF)]
-    expected: FAIL
-
-  [XMLHttpRequest: responseText decoding (text/xml %FE%FF)]
-    expected: FAIL
-
-  [XMLHttpRequest: responseText decoding (text/xml %FE%FF%FE%FF)]
-    expected: FAIL
-
-  [XMLHttpRequest: responseText decoding (text/xml %EF%BB%BF)]
-    expected: FAIL
-
-  [XMLHttpRequest: responseText decoding (text/xml %EF%BB%BF%EF%BB%BF)]
-    expected: FAIL
-
-  [XMLHttpRequest: responseText decoding (application/xml %3C%3Fxml%20version%3D\'1.0\'%20encoding%3D\'windows-1252\'%3F%3E%3Cx%3E%FF%3C%2Fx%3E)]
-    expected: FAIL
-
-  [XMLHttpRequest: responseText decoding (text/html %3C!doctype%20html%3E%3Cmeta%20charset%3Dwindows-1252%3E%FF)]
-    expected: FAIL
-

src/test/wpt/metadata/XMLHttpRequest/send-non-same-origin.sub.htm.ini

@@ -1,4 +1,4 @@
-[send-non-same-origin.htm]
+[send-non-same-origin.sub.htm]
   type: testharness
   [XMLHttpRequest: send() - non same-origin (folder.txt)]
     expected: FAIL

src/test/wpt/metadata/dom/nodes/Document-getElementById.html.ini

@@ -1,5 +1,17 @@
 [Document-getElementById.html]
   type: testharness
-  [Document.getElementById with an empty string]
+  [Calling document.getElementById with an empty string argument.]
+    expected: FAIL
+
+  [add id attribute via innerHTML]
+    expected: FAIL
+
+  [remove id attribute via innerHTML]
+    expected: FAIL
+
+  [add id attribute via outerHTML]
+    expected: FAIL
+
+  [remove id attribute via outerHTML]
     expected: FAIL
 

src/test/wpt/run.py

@@ -17,9 +17,10 @@ from wptrunner import wptrunner, wptcommandline
 import manifest
 
 def update_manifest():
-    opts = argparse.Namespace(rebuild=False, experimental_include_local_changes=True,
+    manifest.update_manifest(wptsubdir("web-platform-tests"),
-                              path=wptsubdir("metadata", "MANIFEST.json"))
+                             rebuild=False,
-    manifest.update_manifest(wptsubdir("web-platform-tests"), opts)
+                             experimental_include_local_changes=True,
+                             path=wptsubdir("metadata", "MANIFEST.json"))
     return True
 
 def run_tests(**kwargs):
@@ -40,8 +41,7 @@ def main():
     parser.add_argument('--update-manifest', dest='update_manifest', action='store_true')
     args = parser.parse_args()
     if args.update_manifest:
-        update_manifest()
+        return update_manifest()
-        return True
     kwargs = set_defaults(args)
     return run_tests(**kwargs)
 

src/test/wpt/web-platform-tests

@@ -1 +1 @@
-Subproject commit b84bb353b62cef1aba499f3a5531f261ef3afeb3
+Subproject commit 5aa5d78e820925c5805959174f3a724843309737