Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 05:00:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove the SCHEME_AND_DOMAIN constant.

Browse source 
All its users are connecting to port 80, which is not typically under the
control of the wpt server.
This commit is contained in:
Ms2ger 2015-06-11 20:13:45 +02:00
parent e8d691aa03
commit 477bfa3675
15 changed files with 34 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/wpt/metadata/websockets/interfaces/WebSocket/events/010.html.ini
View file

@ -1,3 +1,5 @@
[010.html]
type: testharness
expected: CRASH
[WebSockets: setting event handlers to undefined 3]
expected: FAIL

4
tests/wpt/metadata/websockets/interfaces/WebSocket/events/011.html.ini
View file

@ -1,3 +1,5 @@
[011.html]
type: testharness
expected: CRASH
[onmessage]
expected: FAIL

4
tests/wpt/metadata/websockets/interfaces/WebSocket/events/012.html.ini
View file

@ -1,3 +1,5 @@
[012.html]
type: testharness
expected: CRASH
[onmessage]
expected: FAIL

10
tests/wpt/metadata/websockets/interfaces/WebSocket/events/013.html.ini
View file

@ -1,3 +1,11 @@
[013.html]
type: testharness
expected: CRASH
[onclose]
expected: FAIL
[onopen]
expected: FAIL
[onerror]
expected: FAIL

3
tests/wpt/metadata/websockets/interfaces/WebSocket/events/014.html.ini
View file

@ -1,3 +0,0 @@
[014.html]
type: testharness
expected: CRASH

4
tests/wpt/metadata/websockets/interfaces/WebSocket/extensions/001.html.ini
View file

@ -1,3 +1,5 @@
[001.html]
type: testharness
expected: CRASH
[WebSockets: getting extensions in connecting]
expected: FAIL

4
tests/wpt/metadata/websockets/interfaces/WebSocket/protocol/protocol-initial.html.ini
View file

@ -1,3 +1,5 @@
[protocol-initial.html]
type: testharness
expected: CRASH
[WebSockets: getting protocol in connecting]
expected: FAIL

12
tests/wpt/web-platform-tests/websockets/constants.js
View file

@ -1,18 +1,12 @@
//This file requires server-side substitutions and must be included as constants.js?pipe=config
var DOMAIN_FOR_WS_TESTS = "{{host}}";
var DOMAIN_FOR_WSS_TESTS = "{{host}}";
//This file requires server-side substitutions and must be included as constants.js?pipe=sub
var PORT = "{{ports[ws][0]}}";
//FIXME: Add support for wss
var PORT_SSL = "{{ports[ws][0]}}";
// logic for using wss URLs instead of ws
var SCHEME_AND_DOMAIN;
var SCHEME_DOMAIN_PORT;
if (location.search == '?wss') {
SCHEME_AND_DOMAIN = 'wss://'+DOMAIN_FOR_WSS_TESTS;
SCHEME_DOMAIN_PORT = SCHEME_AND_DOMAIN + ":" + PORT_SSL;
SCHEME_DOMAIN_PORT = 'wss://{{host}}:' + PORT_SSL;
} else {
SCHEME_AND_DOMAIN = 'ws://'+DOMAIN_FOR_WS_TESTS;
SCHEME_DOMAIN_PORT = SCHEME_AND_DOMAIN + ":" + PORT;
SCHEME_DOMAIN_PORT = 'ws://{{host}}:' + PORT;
}

2
tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/010.html
View file

@ -8,7 +8,7 @@
var events = ['onclose', 'onopen', 'onerror', 'onmessage'];
for (var i = 0; i < events.length; ++i) {
test(function(){
var ws = new WebSocket(SCHEME_AND_DOMAIN+'/');
var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/empty-message');
var foo = function() {}
ws[events[i]] = foo;
assert_equals(ws[events[i]], foo, events[i]);

2
tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/011.html
View file

@ -8,7 +8,7 @@
var events = ['onclose', 'onopen', 'onerror', 'onmessage'];
for (var i = 0; i < events.length; ++i) {
test(function(t) {
var ws = new WebSocket(SCHEME_AND_DOMAIN+'/');
var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/empty-message');
ws[events[i]] = 1;
assert_equals(ws[events[i]], null);
}, events[i]);

2
tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/012.html
View file

@ -8,7 +8,7 @@
var events = ['onclose', 'onopen', 'onerror', 'onmessage'];
for (var i = 0; i < events.length; ++i) {
test(function(t) {
var ws = new WebSocket(SCHEME_AND_DOMAIN+'/');
var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/empty-message');
ws[events[i]] = ";";
assert_equals(ws[events[i]], null);
}, events[i]);

2
tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/013.html
View file

@ -8,7 +8,7 @@
var events = ['onclose', 'onopen', 'onerror', 'onmessage'];
for (var i = 0; i < events.length; ++i) {
test(function(t) {
var ws = new WebSocket(SCHEME_AND_DOMAIN+'/');
var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/empty-message');
var obj = {handleEvent:this.unreached_func("handleEvent was called")};
ws[events[i]] = obj;
assert_equals(ws[events[i]], obj);

2
tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/014.html
View file

@ -8,7 +8,7 @@
var events = ['onclose', 'onopen', 'onerror', 'onmessage'];
for (var i = 0; i < events.length; ++i) {
test(function() {
var ws = new WebSocket(SCHEME_AND_DOMAIN+'/');
var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/empty-message');
var foo = function() {}
ws[events[i]] = foo;
assert_equals(ws[events[i]], foo, events[i]);

2
tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/extensions/001.html
View file

@ -7,6 +7,6 @@
<script>
test(function(t) {
// The extensions attribute must initially return the empty string
assert_equals((new WebSocket(SCHEME_AND_DOMAIN+'/')).extensions, '');
assert_equals((new WebSocket(SCHEME_DOMAIN_PORT+'/empty-message')).extensions, '');
});
</script>

2
tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/protocol/protocol-initial.html
View file

@ -7,6 +7,6 @@
<script>
test(function(t) {
// The protocol attribute must initially return the empty string
assert_equals((new WebSocket(SCHEME_AND_DOMAIN+'/')).protocol, '');
assert_equals((new WebSocket(SCHEME_DOMAIN_PORT + '/empty-message')).protocol, '');
});
</script>