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

Bring back run_with_memory_reporting in serviceworkerglobalscope #12557

Merged
merged 1 commit into from Aug 2, 2016
Merged

Bring back run_with_memory_reporting in serviceworkerglobalscope #12557

merged 1 commit into from Aug 2, 2016

Conversation

@creativcoder
Copy link
Contributor

creativcoder commented Jul 22, 2016 •
edited by larsbergstrom

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #__ (github issue number if applicable).
  • These changes do not require tests because its a refactor.

This change is Reviewable
@highfive
Copy link

highfive commented Jul 22, 2016

Heads up! This PR modifies the following files:

  • @KiChjang: components/script/dom/serviceworkerglobalscope.rs
@highfive
Copy link

highfive commented Jul 22, 2016

warning Warning warning

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

wafflespeanut commented Jul 22, 2016

r? @jdm
@highfive highfive assigned jdm and unassigned wafflespeanut Jul 22, 2016
@nox nox assigned nox and unassigned jdm Jul 25, 2016
@nox
Copy link
Member

nox commented Jul 25, 2016

-S-awaiting-review +S-needs-code-changes

Reviewed 1 of 1 files at r1.
Review status: all files reviewed at latest revision, 1 unresolved discussion.

components/script/dom/serviceworkerglobalscope.rs, line 181 [r1] (raw file):

            });

            let reporter_name = format!("ServiceWorker-reporter-{}", random::<u64>());

The previous name for this reporter was service-worker-reporter, could you name it back like that and rename service-worker-reporter in components/script/dom/dedicatedworkerglobalscope.rs to dedicated-service-worker-reporter?

Thanks for your contribution!

Comments from Reviewable
@creativcoder creativcoder force-pushed the creativcoder:sw-scope branch from 5010553 to 98c13ca Jul 25, 2016
@bors-servo
Copy link
Contributor

bors-servo commented Jul 27, 2016

☔ The latest upstream changes (presumably #12582) made this pull request unmergeable. Please resolve the merge conflicts.
@creativcoder creativcoder force-pushed the creativcoder:sw-scope branch 2 times, most recently from 79b1b12 to 8bb18ea Jul 27, 2016
@creativcoder
Bring back run_with_memory_reporting in serviceworkerglobalscope
Loading status checks…
4936fb2
@creativcoder creativcoder force-pushed the creativcoder:sw-scope branch from 8bb18ea to 4936fb2 Jul 29, 2016
@creativcoder
Copy link
Contributor Author

creativcoder commented Jul 29, 2016

@nox this has been updated.
@nox nox removed the S-needs-rebase label Aug 1, 2016
@nox
Copy link
Member

nox commented Aug 1, 2016

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

bors-servo commented Aug 1, 2016

📌 Commit 4936fb2 has been approved by nox
@bors-servo
Copy link
Contributor

bors-servo commented Aug 1, 2016

⌛ Testing commit 4936fb2 with merge bf3135a...
bors-servo added a commit that referenced this pull request Aug 1, 2016
@bors-servo
Auto merge of #12557 - creativcoder:sw-scope, r=nox
Loading status checks…
bf3135a 
Bring back run_with_memory_reporting in serviceworkerglobalscope

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [X] These changes do not require tests because its a refactor.

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12557)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Aug 1, 2016

☀️ Test successful - arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows-dev
@bors-servo
Copy link
Contributor

bors-servo commented Aug 1, 2016

👀 Test was successful, but fast-forwarding failed: 422 Update is not a fast forward
@KiChjang
Copy link
Member

KiChjang commented Aug 1, 2016

@bors-servo retry

  • wat
@bors-servo
Copy link
Contributor

bors-servo commented Aug 1, 2016

⌛ Testing commit 4936fb2 with merge a008670...
bors-servo added a commit that referenced this pull request Aug 1, 2016
@bors-servo
Auto merge of #12557 - creativcoder:sw-scope, r=nox
Loading status checks…
a008670 
Bring back run_with_memory_reporting in serviceworkerglobalscope

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [X] These changes do not require tests because its a refactor.

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12557)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Aug 1, 2016

💔 Test failed - linux-rel
@creativcoder
Copy link
Contributor Author

creativcoder commented Aug 2, 2016 

Ran 6801 tests finished in 818.0 seconds.
  • 6800 ran as expected. 1998 tests skipped.
  • 1 tests had unexpected subtest results

Tests with unexpected results:
  ▶ Unexpected subtest result in /html/browsers/history/the-history-interface/001.html:
  │ FAIL [expected PASS] pushState should not actually load the new URL
  │   → assert_true: expected true got undefined
  │ 
  │ tests12/<@http://web-platform.test:8000/html/browsers/history/the-history-interface/001.html:283:13
  │ Test.prototype.step@http://web-platform.test:8000/resources/testharness.js:1402:20
  │ test@http://web-platform.test:8000/resources/testharness.js:500:9
  └ tests12@http://web-platform.test:8000/html/browsers/history/the-history-interface/001.html:282:9

This seems unrelated to the changes made in this PR. @KiChjang Is that an intermittent ?
@KiChjang
Copy link
Member

KiChjang commented Aug 2, 2016

@bors-servo retry
bors-servo added a commit that referenced this pull request Aug 2, 2016
@bors-servo
Auto merge of #12557 - creativcoder:sw-scope, r=nox
Loading status checks…
2aa257f 
Bring back run_with_memory_reporting in serviceworkerglobalscope

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [X] These changes do not require tests because its a refactor.

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12557)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Aug 2, 2016

⌛ Testing commit 4936fb2 with merge 2aa257f...
@bors-servo
Copy link
Contributor

bors-servo commented Aug 2, 2016

☀️ Test successful - arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows-dev
@bors-servo bors-servo merged commit 4936fb2 into servo:master Aug 2, 2016
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@bors-servo bors-servo mentioned this pull request Aug 2, 2016
Merged
3 of 4 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nox nox

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

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