aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--components/net/connector.rs10
-rw-r--r--components/net/websocket_loader.rs29
-rw-r--r--tests/wpt/metadata/websockets/Create-Secure-extensions-empty.any.js.ini8
-rw-r--r--tests/wpt/metadata/websockets/Create-Secure-valid-url-array-protocols.any.js.ini17
-rw-r--r--tests/wpt/metadata/websockets/Create-Secure-valid-url-binaryType-blob.any.js.ini17
-rw-r--r--tests/wpt/metadata/websockets/Create-Secure-valid-url-protocol-setCorrectly.any.js.ini17
-rw-r--r--tests/wpt/metadata/websockets/Create-Secure-valid-url-protocol-string.any.js.ini17
-rw-r--r--tests/wpt/metadata/websockets/Create-Secure-valid-url.any.js.ini17
-rw-r--r--tests/wpt/metadata/websockets/Secure-Close-1000-reason.any.js.ini17
-rw-r--r--tests/wpt/metadata/websockets/Secure-Close-1000-verify-code.any.js.ini17
-rw-r--r--tests/wpt/metadata/websockets/Secure-Close-1000.any.js.ini17
-rw-r--r--tests/wpt/metadata/websockets/Secure-Close-1005-verify-code.any.js.ini17
-rw-r--r--tests/wpt/metadata/websockets/Secure-Close-1005.any.js.ini11
-rw-r--r--tests/wpt/metadata/websockets/Secure-Close-2999-reason.any.js.ini11
-rw-r--r--tests/wpt/metadata/websockets/Secure-Close-3000-reason.any.js.ini17
-rw-r--r--tests/wpt/metadata/websockets/Secure-Close-3000-verify-code.any.js.ini17
-rw-r--r--tests/wpt/metadata/websockets/Secure-Close-4999-reason.any.js.ini17
-rw-r--r--tests/wpt/metadata/websockets/Secure-Close-Reason-124Bytes.any.js.ini11
-rw-r--r--tests/wpt/metadata/websockets/Secure-Close-Reason-Unpaired-surrogates.any.js.ini17
-rw-r--r--tests/wpt/metadata/websockets/Secure-Close-onlyReason.any.js.ini11
-rw-r--r--tests/wpt/metadata/websockets/Secure-Close-readyState-Closed.any.js.ini17
-rw-r--r--tests/wpt/metadata/websockets/Secure-Close-readyState-Closing.any.js.ini11
-rw-r--r--tests/wpt/metadata/websockets/Secure-Close-server-initiated-close.any.js.ini17
-rw-r--r--tests/wpt/metadata/websockets/Secure-Close-undefined.any.js.ini8
-rw-r--r--tests/wpt/metadata/websockets/Secure-Send-65K-data.any.js.ini23
-rw-r--r--tests/wpt/metadata/websockets/Secure-Send-binary-65K-arraybuffer.any.js.ini23
-rw-r--r--tests/wpt/metadata/websockets/Secure-Send-binary-arraybuffer.any.js.ini23
-rw-r--r--tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-float64.any.js.ini23
-rw-r--r--tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-int32.any.js.ini23
-rw-r--r--tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-uint16-offset-length.any.js.ini23
-rw-r--r--tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-uint32-offset.any.js.ini23
-rw-r--r--tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-uint8-offset-length.any.js.ini23
-rw-r--r--tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-uint8-offset.any.js.ini23
-rw-r--r--tests/wpt/metadata/websockets/Secure-Send-binary-blob.any.js.ini23
-rw-r--r--tests/wpt/metadata/websockets/Secure-Send-data.any.js.ini23
-rw-r--r--tests/wpt/metadata/websockets/Secure-Send-null.any.js.ini23
-rw-r--r--tests/wpt/metadata/websockets/Secure-Send-paired-surrogates.any.js.ini23
-rw-r--r--tests/wpt/metadata/websockets/Secure-Send-unicode-data.any.js.ini23
-rw-r--r--tests/wpt/metadata/websockets/Secure-Send-unpaired-surrogates.any.js.ini23
-rw-r--r--tests/wpt/metadata/websockets/binary/001.html.ini8
-rw-r--r--tests/wpt/metadata/websockets/binary/002.html.ini7
-rw-r--r--tests/wpt/metadata/websockets/binary/004.html.ini7
-rw-r--r--tests/wpt/metadata/websockets/binary/005.html.ini8
-rw-r--r--tests/wpt/metadata/websockets/binaryType-wrong-value.any.js.ini17
-rw-r--r--tests/wpt/metadata/websockets/bufferedAmount-unchanged-by-sync-xhr.any.js.ini6
-rw-r--r--tests/wpt/metadata/websockets/closing-handshake/002.html.ini8
-rw-r--r--tests/wpt/metadata/websockets/closing-handshake/003.html.ini8
-rw-r--r--tests/wpt/metadata/websockets/closing-handshake/004.html.ini8
-rw-r--r--tests/wpt/metadata/websockets/constructor/006.html.ini8
-rw-r--r--tests/wpt/metadata/websockets/constructor/009.html.ini8
-rw-r--r--tests/wpt/metadata/websockets/constructor/011.html.ini3
-rw-r--r--tests/wpt/metadata/websockets/constructor/018.html.ini8
-rw-r--r--tests/wpt/metadata/websockets/constructor/019.html.ini8
-rw-r--r--tests/wpt/metadata/websockets/constructor/020.html.ini8
-rw-r--r--tests/wpt/metadata/websockets/constructor/022.html.ini8
-rw-r--r--tests/wpt/metadata/websockets/cookies/001.html.ini8
-rw-r--r--tests/wpt/metadata/websockets/cookies/002.html.ini8
-rw-r--r--tests/wpt/metadata/websockets/cookies/003.html.ini8
-rw-r--r--tests/wpt/metadata/websockets/cookies/004.html.ini8
-rw-r--r--tests/wpt/metadata/websockets/cookies/005.html.ini3
-rw-r--r--tests/wpt/metadata/websockets/extended-payload-length.html.ini17
-rw-r--r--tests/wpt/metadata/websockets/interfaces/CloseEvent/clean-close.html.ini8
-rw-r--r--tests/wpt/metadata/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-arraybuffer.html.ini8
-rw-r--r--tests/wpt/metadata/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-blob.html.ini8
-rw-r--r--tests/wpt/metadata/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-getting.html.ini8
-rw-r--r--tests/wpt/metadata/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-large.html.ini8
-rw-r--r--tests/wpt/metadata/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-unicode.html.ini9
-rw-r--r--tests/wpt/metadata/websockets/interfaces/WebSocket/close/close-connecting.html.ini8
-rw-r--r--tests/wpt/metadata/websockets/interfaces/WebSocket/events/016.html.ini8
-rw-r--r--tests/wpt/metadata/websockets/interfaces/WebSocket/events/018.html.ini12
-rw-r--r--tests/wpt/metadata/websockets/interfaces/WebSocket/readyState/006.html.ini8
-rw-r--r--tests/wpt/metadata/websockets/interfaces/WebSocket/readyState/007.html.ini8
-rw-r--r--tests/wpt/metadata/websockets/interfaces/WebSocket/readyState/008.html.ini8
-rw-r--r--tests/wpt/metadata/websockets/interfaces/WebSocket/send/005.html.ini9
-rw-r--r--tests/wpt/metadata/websockets/interfaces/WebSocket/send/006.html.ini9
-rw-r--r--tests/wpt/metadata/websockets/interfaces/WebSocket/send/007.html.ini8
-rw-r--r--tests/wpt/metadata/websockets/interfaces/WebSocket/send/008.html.ini2
-rw-r--r--tests/wpt/metadata/websockets/interfaces/WebSocket/send/009.html.ini8
-rw-r--r--tests/wpt/metadata/websockets/interfaces/WebSocket/send/010.html.ini39
-rw-r--r--tests/wpt/metadata/websockets/interfaces/WebSocket/send/011.html.ini8
-rw-r--r--tests/wpt/metadata/websockets/interfaces/WebSocket/send/012.html.ini8
-rw-r--r--tests/wpt/metadata/websockets/keeping-connection-open/001.html.ini8
-rw-r--r--tests/wpt/metadata/websockets/opening-handshake/002.html.ini8
-rw-r--r--tests/wpt/metadata/websockets/opening-handshake/005.html.ini9
84 files changed, 43 insertions, 1064 deletions
diff --git a/components/net/connector.rs b/components/net/connector.rs
index e27884c45fc..03ee7e5459d 100644
--- a/components/net/connector.rs
+++ b/components/net/connector.rs
@@ -8,7 +8,7 @@ use hyper::error::{Result as HyperResult, Error as HyperError};
use hyper::net::{NetworkConnector, HttpsStream, HttpStream, SslClient};
use hyper_openssl::OpensslClient;
use openssl::ssl::{SSL_OP_NO_COMPRESSION, SSL_OP_NO_SSLV2, SSL_OP_NO_SSLV3};
-use openssl::ssl::{SslConnectorBuilder, SslMethod};
+use openssl::ssl::{SslConnector, SslConnectorBuilder, SslMethod};
use openssl::x509;
use std::io;
use std::net::TcpStream;
@@ -50,7 +50,7 @@ impl NetworkConnector for HttpsConnector {
pub type Connector = HttpsConnector;
-pub fn create_ssl_client(certs: &str) -> OpensslClient {
+pub fn create_ssl_connector(certs: &str) -> SslConnector {
// certs include multiple certificates. We could add all of them at once,
// but if any of them were already added, openssl would fail to insert all
// of them.
@@ -79,7 +79,11 @@ pub fn create_ssl_client(certs: &str) -> OpensslClient {
}
ssl_connector_builder.set_cipher_list(DEFAULT_CIPHERS).expect("could not set ciphers");
ssl_connector_builder.set_options(SSL_OP_NO_SSLV2 | SSL_OP_NO_SSLV3 | SSL_OP_NO_COMPRESSION);
- let ssl_connector = ssl_connector_builder.build();
+ ssl_connector_builder.build()
+}
+
+pub fn create_ssl_client(certs: &str) -> OpensslClient {
+ let ssl_connector = create_ssl_connector(certs);
OpensslClient::from(ssl_connector)
}
diff --git a/components/net/websocket_loader.rs b/components/net/websocket_loader.rs
index 34e8f68d0b0..2f6dcf5b768 100644
--- a/components/net/websocket_loader.rs
+++ b/components/net/websocket_loader.rs
@@ -2,7 +2,9 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+use connector::create_ssl_connector;
use cookie::Cookie;
+use embedder_traits::resources::{self, Resource};
use fetch::methods::should_be_blocked_due_to_bad_port;
use hosts::replace_host;
use http_loader::HttpState;
@@ -11,13 +13,17 @@ use ipc_channel::ipc::{IpcReceiver, IpcSender};
use net_traits::{CookieSource, MessageData};
use net_traits::{WebSocketDomAction, WebSocketNetworkEvent};
use net_traits::request::{RequestInit, RequestMode};
+use openssl::ssl::SslStream;
+use servo_config::opts;
use servo_url::ServoUrl;
+use std::fs;
use std::sync::Arc;
use std::sync::atomic::{AtomicBool, Ordering};
use std::thread;
use url::Url;
use ws::{CloseCode, Factory, Handler, Handshake, Message, Request, Response as WsResponse, Sender, WebSocket};
use ws::{Error as WebSocketError, ErrorKind as WebSocketErrorKind, Result as WebSocketResult};
+use ws::util::TcpStream;
/// A client for connecting to a websocket server
#[derive(Clone)]
@@ -119,6 +125,29 @@ impl<'a> Handler for Client<'a> {
debug!("Connection closing due to ({:?}) {}", code, reason);
let _ = self.event_sender.send(WebSocketNetworkEvent::Close(Some(code.into()), reason.to_owned()));
}
+
+ fn upgrade_ssl_client(
+ &mut self,
+ stream: TcpStream,
+ url: &Url,
+ ) -> WebSocketResult<SslStream<TcpStream>> {
+ let certs = match opts::get().certificate_path {
+ Some(ref path) => {
+ fs::read_to_string(path).expect("Couldn't not find certificate file")
+ }
+ None => {
+ resources::read_string(Resource::SSLCertificates)
+ },
+ };
+
+ let domain = self.resource_url.as_url().domain().ok_or(WebSocketError::new(
+ WebSocketErrorKind::Protocol,
+ format!("Unable to parse domain from {}. Needed for SSL.", url),
+ ))?;
+ let connector = create_ssl_connector(&certs);
+ connector.connect(domain, stream).map_err(WebSocketError::from)
+ }
+
}
pub fn init(
diff --git a/tests/wpt/metadata/websockets/Create-Secure-extensions-empty.any.js.ini b/tests/wpt/metadata/websockets/Create-Secure-extensions-empty.any.js.ini
index 5ca3d5ef4f1..6ed09e913f3 100644
--- a/tests/wpt/metadata/websockets/Create-Secure-extensions-empty.any.js.ini
+++ b/tests/wpt/metadata/websockets/Create-Secure-extensions-empty.any.js.ini
@@ -1,17 +1,17 @@
[Create-Secure-extensions-empty.any.html]
expected: TIMEOUT
[W3C WebSocket API - Create Secure WebSocket - wsocket.extensions should be set to '' after connection is established - Connection should be opened]
- expected: NOTRUN
+ expected: FAIL
[W3C WebSocket API - Create Secure WebSocket - wsocket.extensions should be set to '' after connection is established - Connection should be closed]
- expected: FAIL
+ expected: NOTRUN
[Create-Secure-extensions-empty.any.worker.html]
expected: TIMEOUT
[W3C WebSocket API - Create Secure WebSocket - wsocket.extensions should be set to '' after connection is established - Connection should be opened]
- expected: NOTRUN
+ expected: FAIL
[W3C WebSocket API - Create Secure WebSocket - wsocket.extensions should be set to '' after connection is established - Connection should be closed]
- expected: FAIL
+ expected: NOTRUN
diff --git a/tests/wpt/metadata/websockets/Create-Secure-valid-url-array-protocols.any.js.ini b/tests/wpt/metadata/websockets/Create-Secure-valid-url-array-protocols.any.js.ini
deleted file mode 100644
index c0e66ad5662..00000000000
--- a/tests/wpt/metadata/websockets/Create-Secure-valid-url-array-protocols.any.js.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-[Create-Secure-valid-url-array-protocols.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and array of protocol strings - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and array of protocol strings - Connection should be closed]
- expected: FAIL
-
-
-[Create-Secure-valid-url-array-protocols.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and array of protocol strings - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and array of protocol strings - Connection should be closed]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/Create-Secure-valid-url-binaryType-blob.any.js.ini b/tests/wpt/metadata/websockets/Create-Secure-valid-url-binaryType-blob.any.js.ini
deleted file mode 100644
index 3bdef7640e1..00000000000
--- a/tests/wpt/metadata/websockets/Create-Secure-valid-url-binaryType-blob.any.js.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-[Create-Secure-valid-url-binaryType-blob.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - wsocket.binaryType should be set to 'blob' after connection is established - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Create Secure WebSocket - wsocket.binaryType should be set to 'blob' after connection is established - Connection should be closed]
- expected: FAIL
-
-
-[Create-Secure-valid-url-binaryType-blob.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - wsocket.binaryType should be set to 'blob' after connection is established - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Create Secure WebSocket - wsocket.binaryType should be set to 'blob' after connection is established - Connection should be closed]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/Create-Secure-valid-url-protocol-setCorrectly.any.js.ini b/tests/wpt/metadata/websockets/Create-Secure-valid-url-protocol-setCorrectly.any.js.ini
deleted file mode 100644
index 444be8a2ba2..00000000000
--- a/tests/wpt/metadata/websockets/Create-Secure-valid-url-protocol-setCorrectly.any.js.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-[Create-Secure-valid-url-protocol-setCorrectly.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and protocol string - protocol should be set correctly - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and protocol string - Connection should be closed]
- expected: FAIL
-
-
-[Create-Secure-valid-url-protocol-setCorrectly.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and protocol string - protocol should be set correctly - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and protocol string - Connection should be closed]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/Create-Secure-valid-url-protocol-string.any.js.ini b/tests/wpt/metadata/websockets/Create-Secure-valid-url-protocol-string.any.js.ini
deleted file mode 100644
index 6b7df3e2c34..00000000000
--- a/tests/wpt/metadata/websockets/Create-Secure-valid-url-protocol-string.any.js.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-[Create-Secure-valid-url-protocol-string.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Check readyState is 1]
- expected: NOTRUN
-
- [W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and protocol string - Connection should be closed]
- expected: FAIL
-
-
-[Create-Secure-valid-url-protocol-string.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Check readyState is 1]
- expected: NOTRUN
-
- [W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and protocol string - Connection should be closed]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/Create-Secure-valid-url.any.js.ini b/tests/wpt/metadata/websockets/Create-Secure-valid-url.any.js.ini
deleted file mode 100644
index dbf7031841e..00000000000
--- a/tests/wpt/metadata/websockets/Create-Secure-valid-url.any.js.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-[Create-Secure-valid-url.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Pass a valid URL - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Create Secure WebSocket - Pass a valid URL - Connection should be closed]
- expected: FAIL
-
-
-[Create-Secure-valid-url.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Pass a valid URL - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Create Secure WebSocket - Pass a valid URL - Connection should be closed]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/Secure-Close-1000-reason.any.js.ini b/tests/wpt/metadata/websockets/Secure-Close-1000-reason.any.js.ini
deleted file mode 100644
index 9e441aea8f9..00000000000
--- a/tests/wpt/metadata/websockets/Secure-Close-1000-reason.any.js.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-[Secure-Close-1000-reason.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000, reason) - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000, reason) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed]
- expected: FAIL
-
-
-[Secure-Close-1000-reason.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000, reason) - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000, reason) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/Secure-Close-1000-verify-code.any.js.ini b/tests/wpt/metadata/websockets/Secure-Close-1000-verify-code.any.js.ini
deleted file mode 100644
index 96471ca1295..00000000000
--- a/tests/wpt/metadata/websockets/Secure-Close-1000-verify-code.any.js.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-[Secure-Close-1000-verify-code.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000, reason) - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000, reason) - event.code == 1000 and event.reason = 'Clean Close']
- expected: FAIL
-
-
-[Secure-Close-1000-verify-code.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000, reason) - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000, reason) - event.code == 1000 and event.reason = 'Clean Close']
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/Secure-Close-1000.any.js.ini b/tests/wpt/metadata/websockets/Secure-Close-1000.any.js.ini
deleted file mode 100644
index c85ca519d0c..00000000000
--- a/tests/wpt/metadata/websockets/Secure-Close-1000.any.js.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-[Secure-Close-1000.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000) - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed]
- expected: FAIL
-
-
-[Secure-Close-1000.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000) - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/Secure-Close-1005-verify-code.any.js.ini b/tests/wpt/metadata/websockets/Secure-Close-1005-verify-code.any.js.ini
deleted file mode 100644
index 55d554e64cb..00000000000
--- a/tests/wpt/metadata/websockets/Secure-Close-1005-verify-code.any.js.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-[Secure-Close-1005-verify-code.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close() - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close() - return close code is 1005 - Connection should be closed]
- expected: FAIL
-
-
-[Secure-Close-1005-verify-code.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close() - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close() - return close code is 1005 - Connection should be closed]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/Secure-Close-1005.any.js.ini b/tests/wpt/metadata/websockets/Secure-Close-1005.any.js.ini
deleted file mode 100644
index ecc6851d7e9..00000000000
--- a/tests/wpt/metadata/websockets/Secure-Close-1005.any.js.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[Secure-Close-1005.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1005) - see '7.1.5. The WebSocket Connection Close Code' in http://www.ietf.org/rfc/rfc6455.txt]
- expected: NOTRUN
-
-
-[Secure-Close-1005.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1005) - see '7.1.5. The WebSocket Connection Close Code' in http://www.ietf.org/rfc/rfc6455.txt]
- expected: NOTRUN
-
diff --git a/tests/wpt/metadata/websockets/Secure-Close-2999-reason.any.js.ini b/tests/wpt/metadata/websockets/Secure-Close-2999-reason.any.js.ini
deleted file mode 100644
index 711a9c6f9a2..00000000000
--- a/tests/wpt/metadata/websockets/Secure-Close-2999-reason.any.js.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[Secure-Close-2999-reason.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(2999, reason) - INVALID_ACCESS_ERR is thrown]
- expected: NOTRUN
-
-
-[Secure-Close-2999-reason.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(2999, reason) - INVALID_ACCESS_ERR is thrown]
- expected: NOTRUN
-
diff --git a/tests/wpt/metadata/websockets/Secure-Close-3000-reason.any.js.ini b/tests/wpt/metadata/websockets/Secure-Close-3000-reason.any.js.ini
deleted file mode 100644
index 89e2c038128..00000000000
--- a/tests/wpt/metadata/websockets/Secure-Close-3000-reason.any.js.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-[Secure-Close-3000-reason.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(3000, reason) - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(3000, reason) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed]
- expected: FAIL
-
-
-[Secure-Close-3000-reason.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(3000, reason) - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(3000, reason) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/Secure-Close-3000-verify-code.any.js.ini b/tests/wpt/metadata/websockets/Secure-Close-3000-verify-code.any.js.ini
deleted file mode 100644
index ae426bfb130..00000000000
--- a/tests/wpt/metadata/websockets/Secure-Close-3000-verify-code.any.js.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-[Secure-Close-3000-verify-code.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(3000, reason) - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(3000, reason) - verify return code is 3000 - Connection should be closed]
- expected: FAIL
-
-
-[Secure-Close-3000-verify-code.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(3000, reason) - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(3000, reason) - verify return code is 3000 - Connection should be closed]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/Secure-Close-4999-reason.any.js.ini b/tests/wpt/metadata/websockets/Secure-Close-4999-reason.any.js.ini
deleted file mode 100644
index f615be75083..00000000000
--- a/tests/wpt/metadata/websockets/Secure-Close-4999-reason.any.js.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-[Secure-Close-4999-reason.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(4999, reason) - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(4999, reason) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed]
- expected: FAIL
-
-
-[Secure-Close-4999-reason.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(4999, reason) - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(4999, reason) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/Secure-Close-Reason-124Bytes.any.js.ini b/tests/wpt/metadata/websockets/Secure-Close-Reason-124Bytes.any.js.ini
deleted file mode 100644
index 3422eba82af..00000000000
--- a/tests/wpt/metadata/websockets/Secure-Close-Reason-124Bytes.any.js.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[Secure-Close-Reason-124Bytes.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(code, 'reason more than 123 bytes') - SYNTAX_ERR is thrown]
- expected: NOTRUN
-
-
-[Secure-Close-Reason-124Bytes.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(code, 'reason more than 123 bytes') - SYNTAX_ERR is thrown]
- expected: NOTRUN
-
diff --git a/tests/wpt/metadata/websockets/Secure-Close-Reason-Unpaired-surrogates.any.js.ini b/tests/wpt/metadata/websockets/Secure-Close-Reason-Unpaired-surrogates.any.js.ini
deleted file mode 100644
index 746d97c2e20..00000000000
--- a/tests/wpt/metadata/websockets/Secure-Close-Reason-Unpaired-surrogates.any.js.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-[Secure-Close-Reason-Unpaired-surrogates.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get closed]
- expected: FAIL
-
-
-[Secure-Close-Reason-Unpaired-surrogates.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get closed]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/Secure-Close-onlyReason.any.js.ini b/tests/wpt/metadata/websockets/Secure-Close-onlyReason.any.js.ini
deleted file mode 100644
index 053005f01ef..00000000000
--- a/tests/wpt/metadata/websockets/Secure-Close-onlyReason.any.js.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[Secure-Close-onlyReason.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(only reason) - INVALID_ACCESS_ERR is thrown]
- expected: NOTRUN
-
-
-[Secure-Close-onlyReason.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(only reason) - INVALID_ACCESS_ERR is thrown]
- expected: NOTRUN
-
diff --git a/tests/wpt/metadata/websockets/Secure-Close-readyState-Closed.any.js.ini b/tests/wpt/metadata/websockets/Secure-Close-readyState-Closed.any.js.ini
deleted file mode 100644
index 8bdd706233b..00000000000
--- a/tests/wpt/metadata/websockets/Secure-Close-readyState-Closed.any.js.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-[Secure-Close-readyState-Closed.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed]
- expected: FAIL
-
-
-[Secure-Close-readyState-Closed.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/Secure-Close-readyState-Closing.any.js.ini b/tests/wpt/metadata/websockets/Secure-Close-readyState-Closing.any.js.ini
deleted file mode 100644
index 6b34c0e3209..00000000000
--- a/tests/wpt/metadata/websockets/Secure-Close-readyState-Closing.any.js.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[Secure-Close-readyState-Closing.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - readyState should be in CLOSING state just before onclose is called]
- expected: NOTRUN
-
-
-[Secure-Close-readyState-Closing.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Close the Connection - readyState should be in CLOSING state just before onclose is called]
- expected: NOTRUN
-
diff --git a/tests/wpt/metadata/websockets/Secure-Close-server-initiated-close.any.js.ini b/tests/wpt/metadata/websockets/Secure-Close-server-initiated-close.any.js.ini
deleted file mode 100644
index 20e1be81d2e..00000000000
--- a/tests/wpt/metadata/websockets/Secure-Close-server-initiated-close.any.js.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-[Secure-Close-server-initiated-close.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Server initiated Close - Client sends back a CLOSE - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Create Secure WebSocket - Server initiated Close - Client sends back a CLOSE - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed]
- expected: FAIL
-
-
-[Secure-Close-server-initiated-close.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create Secure WebSocket - Server initiated Close - Client sends back a CLOSE - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Create Secure WebSocket - Server initiated Close - Client sends back a CLOSE - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/Secure-Close-undefined.any.js.ini b/tests/wpt/metadata/websockets/Secure-Close-undefined.any.js.ini
index 5b19c388090..300c125e73a 100644
--- a/tests/wpt/metadata/websockets/Secure-Close-undefined.any.js.ini
+++ b/tests/wpt/metadata/websockets/Secure-Close-undefined.any.js.ini
@@ -1,17 +1,9 @@
[Secure-Close-undefined.any.worker.html]
- expected: TIMEOUT
[Untitled]
expected: NOTRUN
- [Secure-Close-undefined]
- expected: NOTRUN
-
[Secure-Close-undefined.any.html]
- expected: TIMEOUT
[Untitled]
expected: NOTRUN
- [Secure-Close-undefined]
- expected: NOTRUN
-
diff --git a/tests/wpt/metadata/websockets/Secure-Send-65K-data.any.js.ini b/tests/wpt/metadata/websockets/Secure-Send-65K-data.any.js.ini
deleted file mode 100644
index 235e7dd08df..00000000000
--- a/tests/wpt/metadata/websockets/Secure-Send-65K-data.any.js.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-[Secure-Send-65K-data.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Send 65K data on a Secure WebSocket - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Send 65K data on a Secure WebSocket - Message should be received]
- expected: NOTRUN
-
- [W3C WebSocket API - Send 65K data on a Secure WebSocket - Connection should be closed]
- expected: FAIL
-
-
-[Secure-Send-65K-data.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Send 65K data on a Secure WebSocket - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Send 65K data on a Secure WebSocket - Message should be received]
- expected: NOTRUN
-
- [W3C WebSocket API - Send 65K data on a Secure WebSocket - Connection should be closed]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/Secure-Send-binary-65K-arraybuffer.any.js.ini b/tests/wpt/metadata/websockets/Secure-Send-binary-65K-arraybuffer.any.js.ini
deleted file mode 100644
index fcb465642ce..00000000000
--- a/tests/wpt/metadata/websockets/Secure-Send-binary-65K-arraybuffer.any.js.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-[Secure-Send-binary-65K-arraybuffer.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Send 65K binary data on a Secure WebSocket - ArrayBuffer - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Send 65K binary data on a Secure WebSocket - ArrayBuffer - Message should be received]
- expected: NOTRUN
-
- [W3C WebSocket API - Send 65K binary data on a Secure WebSocket - ArrayBuffer - Connection should be closed]
- expected: FAIL
-
-
-[Secure-Send-binary-65K-arraybuffer.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Send 65K binary data on a Secure WebSocket - ArrayBuffer - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Send 65K binary data on a Secure WebSocket - ArrayBuffer - Message should be received]
- expected: NOTRUN
-
- [W3C WebSocket API - Send 65K binary data on a Secure WebSocket - ArrayBuffer - Connection should be closed]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/Secure-Send-binary-arraybuffer.any.js.ini b/tests/wpt/metadata/websockets/Secure-Send-binary-arraybuffer.any.js.ini
deleted file mode 100644
index 7106a32a570..00000000000
--- a/tests/wpt/metadata/websockets/Secure-Send-binary-arraybuffer.any.js.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-[Secure-Send-binary-arraybuffer.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Send binary data on a Secure WebSocket - ArrayBuffer - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Send binary data on a Secure WebSocket - ArrayBuffer - Message should be received]
- expected: NOTRUN
-
- [W3C WebSocket API - Send binary data on a Secure WebSocket - ArrayBuffer - Connection should be closed]
- expected: FAIL
-
-
-[Secure-Send-binary-arraybuffer.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Send binary data on a Secure WebSocket - ArrayBuffer - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Send binary data on a Secure WebSocket - ArrayBuffer - Message should be received]
- expected: NOTRUN
-
- [W3C WebSocket API - Send binary data on a Secure WebSocket - ArrayBuffer - Connection should be closed]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-float64.any.js.ini b/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-float64.any.js.ini
deleted file mode 100644
index cfe882566f9..00000000000
--- a/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-float64.any.js.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-[Secure-Send-binary-arraybufferview-float64.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Float64Array - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Float64Array - Message should be received]
- expected: NOTRUN
-
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Float64Array - Connection should be closed]
- expected: FAIL
-
-
-[Secure-Send-binary-arraybufferview-float64.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Float64Array - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Float64Array - Message should be received]
- expected: NOTRUN
-
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Float64Array - Connection should be closed]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-int32.any.js.ini b/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-int32.any.js.ini
deleted file mode 100644
index ba430a5d619..00000000000
--- a/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-int32.any.js.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-[Secure-Send-binary-arraybufferview-int32.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int32Array - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int32Array - Message should be received]
- expected: NOTRUN
-
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int32Array - Connection should be closed]
- expected: FAIL
-
-
-[Secure-Send-binary-arraybufferview-int32.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int32Array - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int32Array - Message should be received]
- expected: NOTRUN
-
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int32Array - Connection should be closed]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-uint16-offset-length.any.js.ini b/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-uint16-offset-length.any.js.ini
deleted file mode 100644
index cc48500aa66..00000000000
--- a/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-uint16-offset-length.any.js.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-[Secure-Send-binary-arraybufferview-uint16-offset-length.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint16Array with offset and length - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint16Array with offset and length - Message should be received]
- expected: NOTRUN
-
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint16Array with offset and length - Connection should be closed]
- expected: FAIL
-
-
-[Secure-Send-binary-arraybufferview-uint16-offset-length.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint16Array with offset and length - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint16Array with offset and length - Message should be received]
- expected: NOTRUN
-
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint16Array with offset and length - Connection should be closed]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-uint32-offset.any.js.ini b/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-uint32-offset.any.js.ini
deleted file mode 100644
index c826ada9e75..00000000000
--- a/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-uint32-offset.any.js.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-[Secure-Send-binary-arraybufferview-uint32-offset.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint32Array with offset - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint32Array with offset - Message should be received]
- expected: NOTRUN
-
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint32Array with offset - Connection should be closed]
- expected: FAIL
-
-
-[Secure-Send-binary-arraybufferview-uint32-offset.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint32Array with offset - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint32Array with offset - Message should be received]
- expected: NOTRUN
-
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint32Array with offset - Connection should be closed]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-uint8-offset-length.any.js.ini b/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-uint8-offset-length.any.js.ini
deleted file mode 100644
index 96b8f1a4e03..00000000000
--- a/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-uint8-offset-length.any.js.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-[Secure-Send-binary-arraybufferview-uint8-offset-length.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset and length - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset and length - Message should be received]
- expected: NOTRUN
-
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset and length - Connection should be closed]
- expected: FAIL
-
-
-[Secure-Send-binary-arraybufferview-uint8-offset-length.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset and length - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset and length - Message should be received]
- expected: NOTRUN
-
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset and length - Connection should be closed]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-uint8-offset.any.js.ini b/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-uint8-offset.any.js.ini
deleted file mode 100644
index 12d2596e0ea..00000000000
--- a/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-uint8-offset.any.js.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-[Secure-Send-binary-arraybufferview-uint8-offset.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset - Message should be received]
- expected: NOTRUN
-
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset - Connection should be closed]
- expected: FAIL
-
-
-[Secure-Send-binary-arraybufferview-uint8-offset.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset - Message should be received]
- expected: NOTRUN
-
- [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset - Connection should be closed]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/Secure-Send-binary-blob.any.js.ini b/tests/wpt/metadata/websockets/Secure-Send-binary-blob.any.js.ini
deleted file mode 100644
index 2fca8892d04..00000000000
--- a/tests/wpt/metadata/websockets/Secure-Send-binary-blob.any.js.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-[Secure-Send-binary-blob.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Send binary data on a Secure WebSocket - Blob - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Send binary data on a Secure WebSocket - Blob - Message should be received]
- expected: NOTRUN
-
- [W3C WebSocket API - Send binary data on a Secure WebSocket - Blob - Connection should be closed]
- expected: FAIL
-
-
-[Secure-Send-binary-blob.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Send binary data on a Secure WebSocket - Blob - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Send binary data on a Secure WebSocket - Blob - Message should be received]
- expected: NOTRUN
-
- [W3C WebSocket API - Send binary data on a Secure WebSocket - Blob - Connection should be closed]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/Secure-Send-data.any.js.ini b/tests/wpt/metadata/websockets/Secure-Send-data.any.js.ini
deleted file mode 100644
index b82023d38c3..00000000000
--- a/tests/wpt/metadata/websockets/Secure-Send-data.any.js.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-[Secure-Send-data.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Send data on a Secure WebSocket - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Send data on a Secure WebSocket - Message should be received]
- expected: NOTRUN
-
- [W3C WebSocket API - Send data on a Secure WebSocket - Connection should be closed]
- expected: FAIL
-
-
-[Secure-Send-data.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Send data on a Secure WebSocket - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Send data on a Secure WebSocket - Message should be received]
- expected: NOTRUN
-
- [W3C WebSocket API - Send data on a Secure WebSocket - Connection should be closed]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/Secure-Send-null.any.js.ini b/tests/wpt/metadata/websockets/Secure-Send-null.any.js.ini
deleted file mode 100644
index 6c3e726618e..00000000000
--- a/tests/wpt/metadata/websockets/Secure-Send-null.any.js.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-[Secure-Send-null.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Send null data on a Secure WebSocket - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Send null data on a Secure WebSocket - Message should be received]
- expected: NOTRUN
-
- [W3C WebSocket API - Send null data on a Secure WebSocket - Connection should be closed]
- expected: FAIL
-
-
-[Secure-Send-null.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Send null data on a Secure WebSocket - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Send null data on a Secure WebSocket - Message should be received]
- expected: NOTRUN
-
- [W3C WebSocket API - Send null data on a Secure WebSocket - Connection should be closed]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/Secure-Send-paired-surrogates.any.js.ini b/tests/wpt/metadata/websockets/Secure-Send-paired-surrogates.any.js.ini
deleted file mode 100644
index 4c2399dc77b..00000000000
--- a/tests/wpt/metadata/websockets/Secure-Send-paired-surrogates.any.js.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-[Secure-Send-paired-surrogates.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Send paired surrogates data on a Secure WebSocket - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Send paired surrogates data on a Secure WebSocket - Message should be received]
- expected: NOTRUN
-
- [W3C WebSocket API - Send paired surrogates data on a Secure WebSocket - Connection should be closed]
- expected: FAIL
-
-
-[Secure-Send-paired-surrogates.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Send paired surrogates data on a Secure WebSocket - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Send paired surrogates data on a Secure WebSocket - Message should be received]
- expected: NOTRUN
-
- [W3C WebSocket API - Send paired surrogates data on a Secure WebSocket - Connection should be closed]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/Secure-Send-unicode-data.any.js.ini b/tests/wpt/metadata/websockets/Secure-Send-unicode-data.any.js.ini
deleted file mode 100644
index 2e4554695c7..00000000000
--- a/tests/wpt/metadata/websockets/Secure-Send-unicode-data.any.js.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-[Secure-Send-unicode-data.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Send unicode data on a Secure WebSocket - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Send unicode data on a Secure WebSocket - Message should be received]
- expected: NOTRUN
-
- [W3C WebSocket API - Send unicode data on a Secure WebSocket - Connection should be closed]
- expected: FAIL
-
-
-[Secure-Send-unicode-data.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Send unicode data on a Secure WebSocket - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Send unicode data on a Secure WebSocket - Message should be received]
- expected: NOTRUN
-
- [W3C WebSocket API - Send unicode data on a Secure WebSocket - Connection should be closed]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/Secure-Send-unpaired-surrogates.any.js.ini b/tests/wpt/metadata/websockets/Secure-Send-unpaired-surrogates.any.js.ini
deleted file mode 100644
index 30117ddb4a2..00000000000
--- a/tests/wpt/metadata/websockets/Secure-Send-unpaired-surrogates.any.js.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-[Secure-Send-unpaired-surrogates.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Send unpaired surrogates on a Secure WebSocket - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Send unpaired surrogates on a Secure WebSocket - Message should be received]
- expected: NOTRUN
-
- [W3C WebSocket API - Send unpaired surrogates on a Secure WebSocket - Connection should be closed]
- expected: FAIL
-
-
-[Secure-Send-unpaired-surrogates.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Send unpaired surrogates on a Secure WebSocket - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Send unpaired surrogates on a Secure WebSocket - Message should be received]
- expected: NOTRUN
-
- [W3C WebSocket API - Send unpaired surrogates on a Secure WebSocket - Connection should be closed]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/binary/001.html.ini b/tests/wpt/metadata/websockets/binary/001.html.ini
deleted file mode 100644
index 5bd89b3b338..00000000000
--- a/tests/wpt/metadata/websockets/binary/001.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[001.html?wss]
- type: testharness
- expected: TIMEOUT
- [WebSockets: Send/Receive blob, blob size less than network array buffer]
- expected: TIMEOUT
-
-
-[001.html]
diff --git a/tests/wpt/metadata/websockets/binary/002.html.ini b/tests/wpt/metadata/websockets/binary/002.html.ini
deleted file mode 100644
index 95f1b8e77c8..00000000000
--- a/tests/wpt/metadata/websockets/binary/002.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[002.html?wss]
- type: testharness
- [WebSockets: Send/Receive blob, blob size greater than network array buffer]
- expected: TIMEOUT
-
-
-[002.html]
diff --git a/tests/wpt/metadata/websockets/binary/004.html.ini b/tests/wpt/metadata/websockets/binary/004.html.ini
deleted file mode 100644
index 1c519088836..00000000000
--- a/tests/wpt/metadata/websockets/binary/004.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[004.html?wss]
- type: testharness
- [WebSockets: Send/Receive ArrayBuffer, size greater than network array buffer]
- expected: TIMEOUT
-
-
-[004.html]
diff --git a/tests/wpt/metadata/websockets/binary/005.html.ini b/tests/wpt/metadata/websockets/binary/005.html.ini
deleted file mode 100644
index 12097e48faa..00000000000
--- a/tests/wpt/metadata/websockets/binary/005.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[005.html?wss]
- type: testharness
- expected: TIMEOUT
- [WebSockets: Send/Receive ArrayBuffer, size less than network array buffer]
- expected: TIMEOUT
-
-
-[005.html]
diff --git a/tests/wpt/metadata/websockets/binaryType-wrong-value.any.js.ini b/tests/wpt/metadata/websockets/binaryType-wrong-value.any.js.ini
deleted file mode 100644
index 90bcc769f5b..00000000000
--- a/tests/wpt/metadata/websockets/binaryType-wrong-value.any.js.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-[binaryType-wrong-value.any.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create WebSocket - set binaryType to something other than blob or arraybuffer - SYNTAX_ERR is returned - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Create WebSocket - set binaryType to something other than blob or arraybuffer - SYNTAX_ERR is returned - Connection should be closed]
- expected: FAIL
-
-
-[binaryType-wrong-value.any.worker.html]
- expected: TIMEOUT
- [W3C WebSocket API - Create WebSocket - set binaryType to something other than blob or arraybuffer - SYNTAX_ERR is returned - Connection should be opened]
- expected: NOTRUN
-
- [W3C WebSocket API - Create WebSocket - set binaryType to something other than blob or arraybuffer - SYNTAX_ERR is returned - Connection should be closed]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/bufferedAmount-unchanged-by-sync-xhr.any.js.ini b/tests/wpt/metadata/websockets/bufferedAmount-unchanged-by-sync-xhr.any.js.ini
index d6099c260b1..729d6ea4fdc 100644
--- a/tests/wpt/metadata/websockets/bufferedAmount-unchanged-by-sync-xhr.any.js.ini
+++ b/tests/wpt/metadata/websockets/bufferedAmount-unchanged-by-sync-xhr.any.js.ini
@@ -1,12 +1,6 @@
[bufferedAmount-unchanged-by-sync-xhr.any.html]
- [bufferedAmount should not be updated during a sync XHR]
- expected: FAIL
-
[bufferedAmount-unchanged-by-sync-xhr.any.worker.html]
- [bufferedAmount should not be updated during a sync XHR]
- expected: FAIL
-
[bufferedAmount-unchanged-by-sync-xhr.any.sharedworker.html]
[bufferedAmount-unchanged-by-sync-xhr]
diff --git a/tests/wpt/metadata/websockets/closing-handshake/002.html.ini b/tests/wpt/metadata/websockets/closing-handshake/002.html.ini
deleted file mode 100644
index 010d72a10f3..00000000000
--- a/tests/wpt/metadata/websockets/closing-handshake/002.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[002.html]
- type: testharness
-
-[002.html?wss]
- type: testharness
- [WebSockets: server sends closing handshake]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/closing-handshake/003.html.ini b/tests/wpt/metadata/websockets/closing-handshake/003.html.ini
deleted file mode 100644
index 2c4e0d75a55..00000000000
--- a/tests/wpt/metadata/websockets/closing-handshake/003.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[003.html?wss]
- type: testharness
- [WebSockets: client sends closing handshake]
- expected: FAIL
-
-
-[003.html]
- type: testharness
diff --git a/tests/wpt/metadata/websockets/closing-handshake/004.html.ini b/tests/wpt/metadata/websockets/closing-handshake/004.html.ini
deleted file mode 100644
index eb31283da7b..00000000000
--- a/tests/wpt/metadata/websockets/closing-handshake/004.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[004.html]
- type: testharness
-
-[004.html?wss]
- type: testharness
- [WebSockets: data after closing handshake]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/constructor/006.html.ini b/tests/wpt/metadata/websockets/constructor/006.html.ini
deleted file mode 100644
index 6af268de208..00000000000
--- a/tests/wpt/metadata/websockets/constructor/006.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[006.html]
- type: testharness
-
-[006.html?wss]
- type: testharness
- [WebSockets: converting first arguments]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/constructor/009.html.ini b/tests/wpt/metadata/websockets/constructor/009.html.ini
deleted file mode 100644
index e45d8d2c028..00000000000
--- a/tests/wpt/metadata/websockets/constructor/009.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[009.html?wss]
- type: testharness
- [WebSockets: protocol]
- expected: FAIL
-
-
-[009.html]
- type: testharness
diff --git a/tests/wpt/metadata/websockets/constructor/011.html.ini b/tests/wpt/metadata/websockets/constructor/011.html.ini
index fc62c3a7ec7..01f80aa2dbe 100644
--- a/tests/wpt/metadata/websockets/constructor/011.html.ini
+++ b/tests/wpt/metadata/websockets/constructor/011.html.ini
@@ -6,3 +6,6 @@
[011.html?wss]
type: testharness
+ [WebSockets: protocol mismatch]
+ expected: FAIL
+
diff --git a/tests/wpt/metadata/websockets/constructor/018.html.ini b/tests/wpt/metadata/websockets/constructor/018.html.ini
deleted file mode 100644
index 929c21a5d59..00000000000
--- a/tests/wpt/metadata/websockets/constructor/018.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[018.html]
- type: testharness
-
-[018.html?wss]
- type: testharness
- [WebSockets: NULL char in url]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/constructor/019.html.ini b/tests/wpt/metadata/websockets/constructor/019.html.ini
deleted file mode 100644
index 1e4154af92b..00000000000
--- a/tests/wpt/metadata/websockets/constructor/019.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[019.html]
- type: testharness
-
-[019.html?wss]
- type: testharness
- [WebSockets: uppercase 'WS:']
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/constructor/020.html.ini b/tests/wpt/metadata/websockets/constructor/020.html.ini
deleted file mode 100644
index a77bf1db31c..00000000000
--- a/tests/wpt/metadata/websockets/constructor/020.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[020.html]
- type: testharness
-
-[020.html?wss]
- type: testharness
- [WebSockets: uppercase host]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/constructor/022.html.ini b/tests/wpt/metadata/websockets/constructor/022.html.ini
deleted file mode 100644
index 51a53b4b743..00000000000
--- a/tests/wpt/metadata/websockets/constructor/022.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[022.html?wss]
- type: testharness
- [WebSockets: protocol array]
- expected: FAIL
-
-
-[022.html]
- type: testharness
diff --git a/tests/wpt/metadata/websockets/cookies/001.html.ini b/tests/wpt/metadata/websockets/cookies/001.html.ini
deleted file mode 100644
index ad7eb102b4f..00000000000
--- a/tests/wpt/metadata/websockets/cookies/001.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[001.html?wss]
- type: testharness
- [WebSockets: Cookie in request]
- expected: FAIL
-
-
-[001.html]
- type: testharness
diff --git a/tests/wpt/metadata/websockets/cookies/002.html.ini b/tests/wpt/metadata/websockets/cookies/002.html.ini
deleted file mode 100644
index af5d310b625..00000000000
--- a/tests/wpt/metadata/websockets/cookies/002.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[002.html]
- type: testharness
-
-[002.html?wss]
- type: testharness
- [WebSockets: Set-Cookie in response]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/cookies/003.html.ini b/tests/wpt/metadata/websockets/cookies/003.html.ini
deleted file mode 100644
index 9f550edd361..00000000000
--- a/tests/wpt/metadata/websockets/cookies/003.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[003.html]
- type: testharness
-
-[003.html?wss]
- type: testharness
- [WebSockets: sending HttpOnly cookies in ws request]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/cookies/004.html.ini b/tests/wpt/metadata/websockets/cookies/004.html.ini
deleted file mode 100644
index b5d56e6ce58..00000000000
--- a/tests/wpt/metadata/websockets/cookies/004.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[004.html]
- type: testharness
-
-[004.html?wss]
- type: testharness
- [WebSockets: setting HttpOnly cookies in ws response, checking document.cookie]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/cookies/005.html.ini b/tests/wpt/metadata/websockets/cookies/005.html.ini
index a3a7052ee40..03e42d20a06 100644
--- a/tests/wpt/metadata/websockets/cookies/005.html.ini
+++ b/tests/wpt/metadata/websockets/cookies/005.html.ini
@@ -4,6 +4,3 @@
[005.html?wss]
type: testharness
- [WebSockets: setting HttpOnly cookies in ws response, checking ws request]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/extended-payload-length.html.ini b/tests/wpt/metadata/websockets/extended-payload-length.html.ini
deleted file mode 100644
index c2f57f77b02..00000000000
--- a/tests/wpt/metadata/websockets/extended-payload-length.html.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-[extended-payload-length.html]
- type: testharness
-
-[extended-payload-length.html?wss]
- type: testharness
- [Application data is 125 byte which means any 'Extended payload length' field isn't used at all.]
- expected: TIMEOUT
-
- [Application data is 126 byte which starts to use the 16 bit 'Extended payload length' field.]
- expected: TIMEOUT
-
- [Application data is 0xFFFF byte which means the upper bound of the 16 bit 'Extended payload length' field.]
- expected: TIMEOUT
-
- [Application data is (0xFFFF + 1) byte which starts to use the 64 bit 'Extended payload length' field]
- expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/websockets/interfaces/CloseEvent/clean-close.html.ini b/tests/wpt/metadata/websockets/interfaces/CloseEvent/clean-close.html.ini
deleted file mode 100644
index f1f0e0efa5e..00000000000
--- a/tests/wpt/metadata/websockets/interfaces/CloseEvent/clean-close.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[clean-close.html?wss]
- type: testharness
- [WebSockets: wasClean, true]
- expected: FAIL
-
-
-[clean-close.html]
- type: testharness
diff --git a/tests/wpt/metadata/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-arraybuffer.html.ini b/tests/wpt/metadata/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-arraybuffer.html.ini
deleted file mode 100644
index 03f0d0a344c..00000000000
--- a/tests/wpt/metadata/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-arraybuffer.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[bufferedAmount-arraybuffer.html?wss]
- type: testharness
- expected: TIMEOUT
- [WebSockets: bufferedAmount for ArrayBuffer]
- expected: TIMEOUT
-
-
-[bufferedAmount-arraybuffer.html]
diff --git a/tests/wpt/metadata/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-blob.html.ini b/tests/wpt/metadata/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-blob.html.ini
deleted file mode 100644
index 8c7df5100a0..00000000000
--- a/tests/wpt/metadata/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-blob.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[bufferedAmount-blob.html?wss]
- type: testharness
- expected: TIMEOUT
- [WebSockets: bufferedAmount for blob]
- expected: TIMEOUT
-
-
-[bufferedAmount-blob.html]
diff --git a/tests/wpt/metadata/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-getting.html.ini b/tests/wpt/metadata/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-getting.html.ini
deleted file mode 100644
index 56db7585b03..00000000000
--- a/tests/wpt/metadata/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-getting.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[bufferedAmount-getting.html?wss]
- type: testharness
- [WebSockets: bufferedAmount after send()ing]
- expected: FAIL
-
-
-[bufferedAmount-getting.html]
- type: testharness
diff --git a/tests/wpt/metadata/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-large.html.ini b/tests/wpt/metadata/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-large.html.ini
deleted file mode 100644
index 8310303ba41..00000000000
--- a/tests/wpt/metadata/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-large.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[bufferedAmount-large.html]
- type: testharness
-
-[bufferedAmount-large.html?wss]
- type: testharness
- [WebSockets: bufferedAmount for 65K data]
- expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-unicode.html.ini b/tests/wpt/metadata/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-unicode.html.ini
deleted file mode 100644
index 3c0921e6ca7..00000000000
--- a/tests/wpt/metadata/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-unicode.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[bufferedAmount-unicode.html]
- type: testharness
-
-[bufferedAmount-unicode.html?wss]
- type: testharness
- expected: TIMEOUT
- [WebSockets: bufferedAmount for unicode data]
- expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/websockets/interfaces/WebSocket/close/close-connecting.html.ini b/tests/wpt/metadata/websockets/interfaces/WebSocket/close/close-connecting.html.ini
deleted file mode 100644
index e1e790fd16c..00000000000
--- a/tests/wpt/metadata/websockets/interfaces/WebSocket/close/close-connecting.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[close-connecting.html]
- type: testharness
-
-[close-connecting.html?wss]
- type: testharness
- [WebSockets: close() when connecting]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/interfaces/WebSocket/events/016.html.ini b/tests/wpt/metadata/websockets/interfaces/WebSocket/events/016.html.ini
deleted file mode 100644
index c527918a10c..00000000000
--- a/tests/wpt/metadata/websockets/interfaces/WebSocket/events/016.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[016.html]
- type: testharness
-
-[016.html?wss]
- type: testharness
- [WebSockets: addEventListener]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/interfaces/WebSocket/events/018.html.ini b/tests/wpt/metadata/websockets/interfaces/WebSocket/events/018.html.ini
deleted file mode 100644
index c1447c7c95f..00000000000
--- a/tests/wpt/metadata/websockets/interfaces/WebSocket/events/018.html.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[018.html]
- type: testharness
-
-[018.html?wss]
- type: testharness
- expected: TIMEOUT
- [open event]
- expected: TIMEOUT
-
- [message event]
- expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/websockets/interfaces/WebSocket/readyState/006.html.ini b/tests/wpt/metadata/websockets/interfaces/WebSocket/readyState/006.html.ini
deleted file mode 100644
index 61673970363..00000000000
--- a/tests/wpt/metadata/websockets/interfaces/WebSocket/readyState/006.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[006.html?wss]
- type: testharness
- [WebSockets: getting readyState in open]
- expected: FAIL
-
-
-[006.html]
- type: testharness
diff --git a/tests/wpt/metadata/websockets/interfaces/WebSocket/readyState/007.html.ini b/tests/wpt/metadata/websockets/interfaces/WebSocket/readyState/007.html.ini
deleted file mode 100644
index 5d3fb961e82..00000000000
--- a/tests/wpt/metadata/websockets/interfaces/WebSocket/readyState/007.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[007.html?wss]
- type: testharness
- [WebSockets: getting readyState in closing]
- expected: FAIL
-
-
-[007.html]
- type: testharness
diff --git a/tests/wpt/metadata/websockets/interfaces/WebSocket/readyState/008.html.ini b/tests/wpt/metadata/websockets/interfaces/WebSocket/readyState/008.html.ini
deleted file mode 100644
index 14d170b69cf..00000000000
--- a/tests/wpt/metadata/websockets/interfaces/WebSocket/readyState/008.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[008.html?wss]
- type: testharness
- [WebSockets: getting readyState in closed]
- expected: FAIL
-
-
-[008.html]
- type: testharness
diff --git a/tests/wpt/metadata/websockets/interfaces/WebSocket/send/005.html.ini b/tests/wpt/metadata/websockets/interfaces/WebSocket/send/005.html.ini
deleted file mode 100644
index ad78b33e472..00000000000
--- a/tests/wpt/metadata/websockets/interfaces/WebSocket/send/005.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[005.html]
- type: testharness
-
-[005.html?wss]
- type: testharness
- expected: TIMEOUT
- [WebSockets: send() return value]
- expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/websockets/interfaces/WebSocket/send/006.html.ini b/tests/wpt/metadata/websockets/interfaces/WebSocket/send/006.html.ini
deleted file mode 100644
index 24523755dd5..00000000000
--- a/tests/wpt/metadata/websockets/interfaces/WebSocket/send/006.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[006.html]
- type: testharness
-
-[006.html?wss]
- type: testharness
- expected: TIMEOUT
- [WebSockets: send() with unpaired surrogate when readyState is OPEN]
- expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/websockets/interfaces/WebSocket/send/007.html.ini b/tests/wpt/metadata/websockets/interfaces/WebSocket/send/007.html.ini
deleted file mode 100644
index d268d6a5ee6..00000000000
--- a/tests/wpt/metadata/websockets/interfaces/WebSocket/send/007.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[007.html?wss]
- type: testharness
- [WebSockets: close() followed by send()]
- expected: FAIL
-
-
-[007.html]
- type: testharness
diff --git a/tests/wpt/metadata/websockets/interfaces/WebSocket/send/008.html.ini b/tests/wpt/metadata/websockets/interfaces/WebSocket/send/008.html.ini
index a97b34a3eed..ed6fd32c58a 100644
--- a/tests/wpt/metadata/websockets/interfaces/WebSocket/send/008.html.ini
+++ b/tests/wpt/metadata/websockets/interfaces/WebSocket/send/008.html.ini
@@ -3,6 +3,4 @@
[008.html?wss]
type: testharness
- [WebSockets: send() in onclose]
- expected: FAIL
diff --git a/tests/wpt/metadata/websockets/interfaces/WebSocket/send/009.html.ini b/tests/wpt/metadata/websockets/interfaces/WebSocket/send/009.html.ini
deleted file mode 100644
index eb8a2ea25bf..00000000000
--- a/tests/wpt/metadata/websockets/interfaces/WebSocket/send/009.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[009.html]
- type: testharness
-
-[009.html?wss]
- type: testharness
- [WebSockets: send('')]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/interfaces/WebSocket/send/010.html.ini b/tests/wpt/metadata/websockets/interfaces/WebSocket/send/010.html.ini
deleted file mode 100644
index 607f2c1bdaf..00000000000
--- a/tests/wpt/metadata/websockets/interfaces/WebSocket/send/010.html.ini
+++ /dev/null
@@ -1,39 +0,0 @@
-[010.html?wss]
- type: testharness
- expected: TIMEOUT
- [Constructor succeeds]
- expected: TIMEOUT
-
- [WebSockets: sending non-strings (null)]
- expected: NOTRUN
-
- [WebSockets: sending non-strings (undefined)]
- expected: NOTRUN
-
- [WebSockets: sending non-strings (1)]
- expected: NOTRUN
-
- [WebSockets: sending non-strings ([object Window\])]
- expected: NOTRUN
-
- [WebSockets: sending non-strings ([object HTMLBodyElement\])]
- expected: NOTRUN
-
- [WebSockets: sending non-strings ([object Object\])]
- expected: NOTRUN
-
- [WebSockets: sending non-strings ()]
- expected: NOTRUN
-
- [WebSockets: sending non-strings ([object WebSocket\])]
- expected: NOTRUN
-
- [WebSockets: sending non-strings (function (){})]
- expected: NOTRUN
-
- [WebSockets: sending non-strings (Error)]
- expected: NOTRUN
-
-
-[010.html]
- type: testharness
diff --git a/tests/wpt/metadata/websockets/interfaces/WebSocket/send/011.html.ini b/tests/wpt/metadata/websockets/interfaces/WebSocket/send/011.html.ini
deleted file mode 100644
index 19509179771..00000000000
--- a/tests/wpt/metadata/websockets/interfaces/WebSocket/send/011.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[011.html]
- type: testharness
-
-[011.html?wss]
- type: testharness
- [WebSockets: sending non-ascii, combining chars and non-BMP]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/interfaces/WebSocket/send/012.html.ini b/tests/wpt/metadata/websockets/interfaces/WebSocket/send/012.html.ini
deleted file mode 100644
index aa22c95f25d..00000000000
--- a/tests/wpt/metadata/websockets/interfaces/WebSocket/send/012.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[012.html]
- type: testharness
-
-[012.html?wss]
- type: testharness
- [WebSockets: sending null]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/keeping-connection-open/001.html.ini b/tests/wpt/metadata/websockets/keeping-connection-open/001.html.ini
deleted file mode 100644
index ea5509ff2bb..00000000000
--- a/tests/wpt/metadata/websockets/keeping-connection-open/001.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[001.html?wss]
- type: testharness
- [WebSockets: 20s inactivity after handshake]
- expected: FAIL
-
-
-[001.html]
- type: testharness
diff --git a/tests/wpt/metadata/websockets/opening-handshake/002.html.ini b/tests/wpt/metadata/websockets/opening-handshake/002.html.ini
deleted file mode 100644
index 824e5bf7b57..00000000000
--- a/tests/wpt/metadata/websockets/opening-handshake/002.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[002.html]
- type: testharness
-
-[002.html?wss]
- type: testharness
- [WebSockets: valid handshake]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/websockets/opening-handshake/005.html.ini b/tests/wpt/metadata/websockets/opening-handshake/005.html.ini
deleted file mode 100644
index 9f0272ceb28..00000000000
--- a/tests/wpt/metadata/websockets/opening-handshake/005.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[005.html]
- type: testharness
-
-[005.html?wss]
- type: testharness
- expected: TIMEOUT
- [WebSockets: proper first line]
- expected: TIMEOUT
-