Skip to content

/ servo

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make websockets work in a worker scope #9521

Merged
merged 4 commits into from Feb 5, 2016
Merged

Make websockets work in a worker scope #9521

merged 4 commits into from Feb 5, 2016

Conversation

@Manishearth
Copy link
Member

Manishearth commented Feb 3, 2016

r? @jdm

Review on Reviewable
@highfive
Copy link

highfive commented Feb 3, 2016

warning Warning warning

  • This pull request adds a file without the .ini file extension to tests/wpt/metadata. Please consider removing it!
@Manishearth Manishearth force-pushed the Manishearth:ws-worker branch from 1c017e8 to f0902b5 Feb 3, 2016
Manishearth added 2 commits Feb 3, 2016
@Manishearth
Make websockets not crash in a worker scope
ccbd38e
@Manishearth
Fix crash when websocket.js is used from a worker
4f878b2
@Manishearth Manishearth force-pushed the Manishearth:ws-worker branch from f0902b5 to 12f2d22 Feb 3, 2016
@Manishearth
Copy link
Member Author

Manishearth commented Feb 3, 2016

@bors-servo try
@bors-servo
Copy link
Contributor

bors-servo commented Feb 3, 2016

⌛ Trying commit 12f2d22 with merge e3a3193...
bors-servo added a commit that referenced this pull request Feb 3, 2016
@bors-servo
Auto merge of #9521 - Manishearth:ws-worker, r=<try>
e3a3193 
Make websockets work in a worker scope

r? @jdm

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9521)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Feb 3, 2016

💔 Test failed - linux-dev
@Manishearth
Add test for websockets being used from a worker
Loading status checks…
853d4c0
@Manishearth Manishearth force-pushed the Manishearth:ws-worker branch from 12f2d22 to 853d4c0 Feb 3, 2016
@highfive highfive removed the S-tests-failed label Feb 3, 2016
@Manishearth
Copy link
Member Author

Manishearth commented Feb 3, 2016

(the failure was tidy; this still passes wpt)
@jdm jdm self-assigned this Feb 3, 2016
@Ms2ger
Copy link
Contributor

Ms2ger commented Feb 4, 2016

Using a .worker.js file would be shorter. Also, despite what I said yesterday, I'd like a test for the origin attribute too.
@jdm
Copy link
Member

jdm commented Feb 4, 2016

@Ms2ger What test is missing from #9367? There's an explicit location.origin test, and lots of test result updates too.
tests/wpt/metadata/MANIFEST.json Outdated
"testharness": {
"websockets/Send-data-worker.htm": [
{
"path": "websockets/Send-data-worker.htm",

This comment has been minimized.

Sign in to view
Copy link
@Ms2ger

Ms2ger Feb 4, 2016

Contributor

I don't think this should be here.

r+ assuming you file a followup about checking the Origin header in workers.
@Manishearth
Use a .worker.js test
Loading status checks…
396533c
@Manishearth Manishearth force-pushed the Manishearth:ws-worker branch from 9eaf0ce to 396533c Feb 4, 2016
@Manishearth
Copy link
Member Author

Manishearth commented Feb 4, 2016

@bors-servo r=Ms2ger

followup @ #9535
@bors-servo
Copy link
Contributor

bors-servo commented Feb 4, 2016

📌 Commit 396533c has been approved by Ms2ger
@bors-servo
Copy link
Contributor

bors-servo commented Feb 4, 2016

⌛ Testing commit 396533c with merge 5806fb4...
bors-servo added a commit that referenced this pull request Feb 4, 2016
@bors-servo
Auto merge of #9521 - Manishearth:ws-worker, r=Ms2ger
5806fb4 
Make websockets work in a worker scope

r? @jdm

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9521)
<!-- Reviewable:end -->
@jdm jdm assigned Ms2ger and unassigned jdm Feb 4, 2016
@bors-servo
Copy link
Contributor

bors-servo commented Feb 5, 2016

💔 Test failed - mac-rel-wpt
@Manishearth
Copy link
Member Author

Manishearth commented Feb 5, 2016

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Feb 5, 2016

⚡ Previous build results for android, gonk, linux-dev, linux-rel, mac-dev-unit are reusable. Rebuilding only mac-rel-css, mac-rel-wpt...
@bors-servo
Copy link
Contributor

bors-servo commented Feb 5, 2016

💔 Test failed - mac-rel-css
@Manishearth
Copy link
Member Author

Manishearth commented Feb 5, 2016

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Feb 5, 2016

⌛ Testing commit 396533c with merge b35801b...
bors-servo added a commit that referenced this pull request Feb 5, 2016
@bors-servo
Auto merge of #9521 - Manishearth:ws-worker, r=Ms2ger
Loading status checks…
b35801b 
Make websockets work in a worker scope

r? @jdm

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9521)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Feb 5, 2016

☀️ Test successful - android, gonk, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt
@bors-servo bors-servo merged commit 396533c into servo:master Feb 5, 2016
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
This was referenced Feb 5, 2016
Merged
Merged
@Manishearth Manishearth deleted the Manishearth:ws-worker branch Feb 11, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Ms2ger Ms2ger

Labels
S-awaiting-merge
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@Manishearth @highfive @bors-servo @Ms2ger @jdm
You can’t perform that action at this time.