fix(websocket): spec conformance & WPT (#11010)

2 files changed, 191 insertions, 1 deletions

diff --git a/tools/wpt/config.json b/tools/wpt/config.json
index f146607c1..3bcd6612c 100644
--- a/tools/wpt/config.json
+++ b/tools/wpt/config.json
@@ -1,6 +1,11 @@
 {
   "check_subdomains": false,
   "ssl": {
-    "type": "pregenerated"
+    "type": "pregenerated",
+    "pregenerated": {
+      "ca_cert_path": "../../tools/wpt/certs/cacert.pem",
+      "host_cert_path": "../../tools/wpt/certs/web-platform.test.pem",
+      "host_key_path": "../../tools/wpt/certs/web-platform.test.key"
+    }
   }
 }
diff --git a/tools/wpt/expectation.json b/tools/wpt/expectation.json
index 0001f92d3..962c12de6 100644
--- a/tools/wpt/expectation.json
+++ b/tools/wpt/expectation.json
@@ -1023,5 +1023,190 @@
       "set-blob.any.html": true,
       "set.any.html": true
     }
+  },
+  "websockets": {
+    "Close-1000-reason.any.html": true,
+    "Close-1000-reason.any.html?wpt_flags=h2": false,
+    "Close-1000-reason.any.html?wss": true,
+    "Close-1000-verify-code.any.html": true,
+    "Close-1000-verify-code.any.html?wpt_flags=h2": false,
+    "Close-1000-verify-code.any.html?wss": true,
+    "Close-1000.any.html": true,
+    "Close-1000.any.html?wpt_flags=h2": false,
+    "Close-1000.any.html?wss": true,
+    "Close-1005-verify-code.any.html": true,
+    "Close-1005-verify-code.any.html?wpt_flags=h2": false,
+    "Close-1005-verify-code.any.html?wss": true,
+    "Close-1005.any.html": true,
+    "Close-1005.any.html?wpt_flags=h2": false,
+    "Close-1005.any.html?wss": true,
+    "Close-2999-reason.any.html": true,
+    "Close-2999-reason.any.html?wpt_flags=h2": false,
+    "Close-2999-reason.any.html?wss": true,
+    "Close-3000-reason.any.html": true,
+    "Close-3000-reason.any.html?wpt_flags=h2": false,
+    "Close-3000-reason.any.html?wss": true,
+    "Close-3000-verify-code.any.html": true,
+    "Close-3000-verify-code.any.html?wpt_flags=h2": false,
+    "Close-3000-verify-code.any.html?wss": true,
+    "Close-4999-reason.any.html": true,
+    "Close-4999-reason.any.html?wpt_flags=h2": false,
+    "Close-4999-reason.any.html?wss": true,
+    "Close-Reason-124Bytes.any.html": true,
+    "Close-Reason-124Bytes.any.html?wpt_flags=h2": false,
+    "Close-Reason-124Bytes.any.html?wss": true,
+    "Close-onlyReason.any.html": true,
+    "Close-onlyReason.any.html?wpt_flags=h2": false,
+    "Close-onlyReason.any.html?wss": true,
+    "Close-readyState-Closed.any.html": true,
+    "Close-readyState-Closed.any.html?wpt_flags=h2": false,
+    "Close-readyState-Closed.any.html?wss": true,
+    "Close-readyState-Closing.any.html": true,
+    "Close-readyState-Closing.any.html?wpt_flags=h2": false,
+    "Close-readyState-Closing.any.html?wss": true,
+    "Close-reason-unpaired-surrogates.any.html": true,
+    "Close-reason-unpaired-surrogates.any.html?wpt_flags=h2": false,
+    "Close-reason-unpaired-surrogates.any.html?wss": true,
+    "Close-server-initiated-close.any.html": true,
+    "Close-server-initiated-close.any.html?wpt_flags=h2": false,
+    "Close-server-initiated-close.any.html?wss": true,
+    "Close-undefined.any.html": true,
+    "Close-undefined.any.html?wpt_flags=h2": false,
+    "Close-undefined.any.html?wss": true,
+    "Create-asciiSep-protocol-string.any.html": true,
+    "Create-asciiSep-protocol-string.any.html?wpt_flags=h2": true,
+    "Create-asciiSep-protocol-string.any.html?wss": true,
+    "Create-blocked-port.any.html": true,
+    "Create-blocked-port.any.html?wpt_flags=h2": [
+      "Basic check"
+    ],
+    "Create-blocked-port.any.html?wss": true,
+    "Create-extensions-empty.any.html": true,
+    "Create-extensions-empty.any.html?wpt_flags=h2": false,
+    "Create-extensions-empty.any.html?wss": true,
+    "Create-invalid-urls.any.html": true,
+    "Create-invalid-urls.any.html?wpt_flags=h2": true,
+    "Create-invalid-urls.any.html?wss": true,
+    "Create-non-absolute-url.any.html": true,
+    "Create-non-absolute-url.any.html?wpt_flags=h2": true,
+    "Create-non-absolute-url.any.html?wss": true,
+    "Create-nonAscii-protocol-string.any.html": true,
+    "Create-nonAscii-protocol-string.any.html?wpt_flags=h2": true,
+    "Create-nonAscii-protocol-string.any.html?wss": true,
+    "Create-on-worker-shutdown.any.html": false,
+    "Create-protocol-with-space.any.html": true,
+    "Create-protocol-with-space.any.html?wpt_flags=h2": true,
+    "Create-protocol-with-space.any.html?wss": true,
+    "Create-protocols-repeated-case-insensitive.any.html": true,
+    "Create-protocols-repeated-case-insensitive.any.html?wpt_flags=h2": true,
+    "Create-protocols-repeated-case-insensitive.any.html?wss": true,
+    "Create-protocols-repeated.any.html": true,
+    "Create-protocols-repeated.any.html?wpt_flags=h2": true,
+    "Create-protocols-repeated.any.html?wss": true,
+    "Create-url-with-space.any.html": true,
+    "Create-url-with-space.any.html?wpt_flags=h2": true,
+    "Create-url-with-space.any.html?wss": true,
+    "Create-valid-url-array-protocols.any.html": true,
+    "Create-valid-url-array-protocols.any.html?wpt_flags=h2": false,
+    "Create-valid-url-array-protocols.any.html?wss": true,
+    "Create-valid-url-binaryType-blob.any.html": true,
+    "Create-valid-url-binaryType-blob.any.html?wpt_flags=h2": false,
+    "Create-valid-url-binaryType-blob.any.html?wss": true,
+    "Create-valid-url-protocol-empty.any.html": true,
+    "Create-valid-url-protocol-empty.any.html?wpt_flags=h2": true,
+    "Create-valid-url-protocol-empty.any.html?wss": true,
+    "Create-valid-url-protocol-setCorrectly.any.html": true,
+    "Create-valid-url-protocol-setCorrectly.any.html?wpt_flags=h2": false,
+    "Create-valid-url-protocol-setCorrectly.any.html?wss": true,
+    "Create-valid-url-protocol-string.any.html": true,
+    "Create-valid-url-protocol-string.any.html?wpt_flags=h2": false,
+    "Create-valid-url-protocol-string.any.html?wss": true,
+    "Create-valid-url-protocol.any.html": true,
+    "Create-valid-url-protocol.any.html?wpt_flags=h2": false,
+    "Create-valid-url-protocol.any.html?wss": true,
+    "Create-valid-url.any.html": true,
+    "Create-valid-url.any.html?wpt_flags=h2": false,
+    "Create-valid-url.any.html?wss": true,
+    "Create-wrong-scheme.any.html": true,
+    "Create-wrong-scheme.any.html?wpt_flags=h2": true,
+    "Create-wrong-scheme.any.html?wss": true,
+    "Send-0byte-data.any.html": true,
+    "Send-0byte-data.any.html?wpt_flags=h2": false,
+    "Send-0byte-data.any.html?wss": true,
+    "Send-65K-data.any.html": true,
+    "Send-65K-data.any.html?wpt_flags=h2": false,
+    "Send-65K-data.any.html?wss": true,
+    "Send-before-open.any.html": true,
+    "Send-before-open.any.html?wpt_flags=h2": true,
+    "Send-before-open.any.html?wss": true,
+    "Send-binary-65K-arraybuffer.any.html": true,
+    "Send-binary-65K-arraybuffer.any.html?wpt_flags=h2": false,
+    "Send-binary-65K-arraybuffer.any.html?wss": true,
+    "Send-binary-arraybuffer.any.html": true,
+    "Send-binary-arraybuffer.any.html?wpt_flags=h2": false,
+    "Send-binary-arraybuffer.any.html?wss": true,
+    "Send-binary-arraybufferview-float32.any.html": true,
+    "Send-binary-arraybufferview-float32.any.html?wpt_flags=h2": false,
+    "Send-binary-arraybufferview-float32.any.html?wss": true,
+    "Send-binary-arraybufferview-float64.any.html": true,
+    "Send-binary-arraybufferview-float64.any.html?wpt_flags=h2": false,
+    "Send-binary-arraybufferview-float64.any.html?wss": true,
+    "Send-binary-arraybufferview-int16-offset.any.html": true,
+    "Send-binary-arraybufferview-int16-offset.any.html?wpt_flags=h2": false,
+    "Send-binary-arraybufferview-int16-offset.any.html?wss": true,
+    "Send-binary-arraybufferview-int32.any.html": true,
+    "Send-binary-arraybufferview-int32.any.html?wpt_flags=h2": false,
+    "Send-binary-arraybufferview-int32.any.html?wss": true,
+    "Send-binary-arraybufferview-int8.any.html": true,
+    "Send-binary-arraybufferview-int8.any.html?wpt_flags=h2": false,
+    "Send-binary-arraybufferview-int8.any.html?wss": true,
+    "Send-binary-arraybufferview-uint16-offset-length.any.html": true,
+    "Send-binary-arraybufferview-uint16-offset-length.any.html?wpt_flags=h2": false,
+    "Send-binary-arraybufferview-uint16-offset-length.any.html?wss": true,
+    "Send-binary-arraybufferview-uint32-offset.any.html": true,
+    "Send-binary-arraybufferview-uint32-offset.any.html?wpt_flags=h2": false,
+    "Send-binary-arraybufferview-uint32-offset.any.html?wss": true,
+    "Send-binary-arraybufferview-uint8-offset-length.any.html": true,
+    "Send-binary-arraybufferview-uint8-offset-length.any.html?wpt_flags=h2": false,
+    "Send-binary-arraybufferview-uint8-offset-length.any.html?wss": true,
+    "Send-binary-arraybufferview-uint8-offset.any.html": true,
+    "Send-binary-arraybufferview-uint8-offset.any.html?wpt_flags=h2": false,
+    "Send-binary-arraybufferview-uint8-offset.any.html?wss": true,
+    "Send-binary-blob.any.html": true,
+    "Send-binary-blob.any.html?wpt_flags=h2": false,
+    "Send-binary-blob.any.html?wss": true,
+    "Send-data.any.html": true,
+    "Send-data.any.html?wpt_flags=h2": false,
+    "Send-data.any.html?wss": true,
+    "Send-null.any.html": true,
+    "Send-null.any.html?wpt_flags=h2": false,
+    "Send-null.any.html?wss": true,
+    "Send-paired-surrogates.any.html": true,
+    "Send-paired-surrogates.any.html?wpt_flags=h2": false,
+    "Send-paired-surrogates.any.html?wss": true,
+    "Send-unicode-data.any.html": true,
+    "Send-unicode-data.any.html?wpt_flags=h2": false,
+    "Send-unicode-data.any.html?wss": true,
+    "Send-unpaired-surrogates.any.html": true,
+    "Send-unpaired-surrogates.any.html?wpt_flags=h2": false,
+    "Send-unpaired-surrogates.any.html?wss": true,
+    "basic-auth.any.html?wpt_flags=h2": false,
+    "basic-auth.any.html?wss": false,
+    "binaryType-wrong-value.any.html": true,
+    "binaryType-wrong-value.any.html?wpt_flags=h2": false,
+    "binaryType-wrong-value.any.html?wss": true,
+    "bufferedAmount-unchanged-by-sync-xhr.any.html": false,
+    "bufferedAmount-unchanged-by-sync-xhr.any.html?wpt_flags=h2": false,
+    "bufferedAmount-unchanged-by-sync-xhr.any.html?wss": false,
+    "close-invalid.any.html": true,
+    "close-invalid.any.html?wpt_flags=h2": true,
+    "close-invalid.any.html?wss": true,
+    "constructor.any.html": true,
+    "constructor.any.html?wpt_flags=h2": true,
+    "constructor.any.html?wss": true,
+    "eventhandlers.any.html": false,
+    "eventhandlers.any.html?wpt_flags=h2": false,
+    "eventhandlers.any.html?wss": false,
+    "referrer.any.html": true
   }
 }