diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-03-14 18:56:38 +0530 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-03-14 18:56:38 +0530 |
commit | 6895dab07ca1ff61579e9f7cd287b68f1a92f9d3 (patch) | |
tree | 1bc195f492d969f755c3c83d71d4010eafa63eac | |
parent | a862384841cb6e8ff43f627a59b67c4f5189b81b (diff) | |
parent | b408f840a06fda60964fdda53ad3c64f68aef6b1 (diff) | |
download | servo-6895dab07ca1ff61579e9f7cd287b68f1a92f9d3.tar.gz servo-6895dab07ca1ff61579e9f7cd287b68f1a92f9d3.zip |
Auto merge of #9737 - g-k:test-websocket-origin-in-worker, r=Ms2ger
test websocket origin set in worker
Fixes #9535
This crashes and I'm not sure how to debug it (and whether it's a problem with the browser or more likely a problem with the test):
```
./mach test-wpt /websockets/opening-handshake/003-sets-origin.worker --log-raw wpt.log Running 1 tests in web-platform-tests
▶ CRASH [expected OK] /websockets/opening-handshake/003-sets-origin.worker
Ran 1 tests finished in 2.0 seconds.
• 0 ran as expected. 0 tests skipped.
• 1 tests crashed unexpectedly
```
Also, should the test file be in `/websockets/` or `/websockets/opening-handshake/`?
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9737)
<!-- Reviewable:end -->
-rw-r--r-- | tests/wpt/metadata/MANIFEST.json | 4 | ||||
-rw-r--r-- | tests/wpt/web-platform-tests/websockets/opening-handshake/003-sets-origin.worker.js | 19 |
2 files changed, 23 insertions, 0 deletions
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index 8721140f72a..1c1e6a7bd36 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -32070,6 +32070,10 @@ "url": "/websockets/opening-handshake/001.html" }, { + "path": "websockets/opening-handshake/003-sets-origin.worker.js", + "url": "/websockets/opening-handshake/003-sets-origin.worker" + }, + { "path": "websockets/opening-handshake/003.html", "url": "/websockets/opening-handshake/003.html" }, diff --git a/tests/wpt/web-platform-tests/websockets/opening-handshake/003-sets-origin.worker.js b/tests/wpt/web-platform-tests/websockets/opening-handshake/003-sets-origin.worker.js new file mode 100644 index 00000000000..1a10e1e7e6c --- /dev/null +++ b/tests/wpt/web-platform-tests/websockets/opening-handshake/003-sets-origin.worker.js @@ -0,0 +1,19 @@ +importScripts("/resources/testharness.js"); +importScripts('../constants.js?pipe=sub'); +importScripts('../websocket.js?pipe=sub'); + +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/origin'); + ws.onmessage = t.step_func(function(e) { + assert_equals(e.data, location.protocol+'//'+location.host); + ws.onclose = t.step_func(function(e) { + assert_equals(e.wasClean, true); + ws.onclose = t.step_func(function() {assert_unreached()}); + setTimeout(t.step_func_done(), 50) + }) + ws.close(); + }) + ws.onerror = ws.onclose = t.step_func(function() {assert_unreached()}); +}, "W3C WebSocket API - origin set in a Worker"); + +done(); |