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

Update websocket #9660

Merged
merged 1 commit into from Feb 23, 2016
Merged

Update websocket #9660

merged 1 commit into from Feb 23, 2016

Conversation

@SimonSapin
Copy link
Member

SimonSapin commented Feb 16, 2016

Review on Reviewable
@highfive
Copy link

highfive commented Feb 16, 2016

warning Warning warning

  • These commits modify net and script code, but no tests are modified. Please consider adding a test!
@jdm
Copy link
Member

jdm commented Feb 16, 2016

@bors-servo: r+
@bors-servo
Copy link
Contributor

bors-servo commented Feb 16, 2016

📌 Commit ba015ec has been approved by jdm
@jdm jdm self-assigned this Feb 16, 2016
@bors-servo
Copy link
Contributor

bors-servo commented Feb 17, 2016

⌛ Testing commit ba015ec with merge 25b05e0...
bors-servo added a commit that referenced this pull request Feb 17, 2016
@bors-servo
Auto merge of #9660 - servo:websocketup, r=jdm
25b05e0 
Update websocket

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

bors-servo commented Feb 17, 2016

💔 Test failed - linux-rel
@jdm
Copy link
Member

jdm commented Feb 17, 2016

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

bors-servo commented Feb 17, 2016

⌛ Testing commit ba015ec with merge 6a9bee1...
bors-servo added a commit that referenced this pull request Feb 17, 2016
@bors-servo
Auto merge of #9660 - servo:websocketup, r=jdm
6a9bee1 
Update websocket

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

bors-servo commented Feb 17, 2016

💔 Test failed - linux-rel
@SimonSapin
Copy link
Member Author

SimonSapin commented Feb 17, 2016

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

bors-servo commented Feb 17, 2016

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

bors-servo commented Feb 17, 2016

💔 Test failed - linux-rel
@KiChjang
Copy link
Member

KiChjang commented Feb 17, 2016 

Ran 4595 tests finished in 226.0 seconds.
  • 4594 ran as expected. 1372 tests skipped.
  • 1 tests timed out unexpectedly
  • 1 tests had unexpected subtest results

Tests with unexpected results:
  ▶ TIMEOUT [expected OK] /websockets/opening-handshake/003.html

  ▶ Unexpected subtest result in /websockets/opening-handshake/003.html:
  │ TIMEOUT [expected PASS] WebSockets: origin
  └   → Test timed out

These do not look like intermittents.
@SimonSapin
Copy link
Member Author

SimonSapin commented Feb 17, 2016

Code changes: cyderize/rust-websocket@9a7f5b4...020bb89

I’m not really interested in investigating this, I only submitted this PR as a prerequisite to unrelated changes. (Updating websocket for upcoming rust-url breaking changes.)
@bors-servo
Copy link
Contributor

bors-servo commented Feb 18, 2016

☔ The latest upstream changes (presumably #9589) made this pull request unmergeable. Please resolve the merge conflicts.
@SimonSapin
Update websocket
Loading status checks…
4c72be6
@SimonSapin SimonSapin force-pushed the websocketup branch from ba015ec to 4c72be6 Feb 19, 2016
@jdm
Copy link
Member

jdm commented Feb 23, 2016

@bors-servo: r+
@bors-servo
Copy link
Contributor

bors-servo commented Feb 23, 2016

📌 Commit 4c72be6 has been approved by jdm
@bors-servo
Copy link
Contributor

bors-servo commented Feb 23, 2016

⌛ Testing commit 4c72be6 with merge dd9f3d3...
bors-servo added a commit that referenced this pull request Feb 23, 2016
@bors-servo
Auto merge of #9660 - servo:websocketup, r=jdm
dd9f3d3 
Update websocket

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

bors-servo commented Feb 23, 2016

💔 Test failed - linux-rel
@nox
Copy link
Member

nox commented Feb 23, 2016

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

bors-servo commented Feb 23, 2016

⌛ Testing commit 4c72be6 with merge 7840aae...
bors-servo added a commit that referenced this pull request Feb 23, 2016
@bors-servo
Auto merge of #9660 - servo:websocketup, r=jdm
Loading status checks…
7840aae 
Update websocket

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

bors-servo commented Feb 23, 2016

☀️ Test successful - android, gonk, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt
@bors-servo bors-servo merged commit 4c72be6 into master Feb 23, 2016
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@nox nox deleted the websocketup branch Feb 28, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jdm jdm

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

Successfully merging this pull request may close these issues.

None yet

6 participants
@SimonSapin @highfive @jdm @bors-servo @KiChjang @nox
You can’t perform that action at this time.