Skip to content
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

Added tests for cross-origin iframe parentage. #11666

Merged
merged 1 commit into from Jun 12, 2016

Conversation

@asajeffrey
Copy link
Member

asajeffrey commented Jun 7, 2016

Added (currently failing) tests for cross-origin iframe parentage.


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #11478
  • There are tests for these changes

This change is Reviewable

@asajeffrey asajeffrey force-pushed the asajeffrey:cross-origin-parentage-test branch from f180d67 to 08dff69 Jun 9, 2016
@highfive
Copy link

highfive commented Jun 9, 2016

New code was committed to pull request.

@asajeffrey asajeffrey force-pushed the asajeffrey:cross-origin-parentage-test branch from 08dff69 to 36f7663 Jun 9, 2016
@highfive
Copy link

highfive commented Jun 9, 2016

New code was committed to pull request.

@asajeffrey
Copy link
Member Author

asajeffrey commented Jun 9, 2016

Rebased.

</body>
<script>
send_test_results({
"id": '6c8da65d-2c5e-44ef-bb0b-b8b9849aab19',

This comment has been minimized.

@Manishearth

Manishearth Jun 9, 2016

Member

use token() or something

This comment has been minimized.

@Manishearth

Manishearth Jun 9, 2016

Member

oh, not sure how token will work across iframes. @Ms2ger ?

This comment has been minimized.

@asajeffrey

asajeffrey Jun 9, 2016

Author Member

Indeed, hence the hard-wired uuids.

@asajeffrey
Copy link
Member Author

asajeffrey commented Jun 9, 2016

r? @ConnorGBrewster since you're already looking at #11677.

@highfive highfive assigned cbrewster and unassigned Manishearth Jun 9, 2016
@asajeffrey
Copy link
Member Author

asajeffrey commented Jun 9, 2016

Ah, crossed wires with @Manishearth.

@bors-servo
Copy link
Contributor

bors-servo commented Jun 9, 2016

The latest upstream changes (presumably #11677) made this pull request unmergeable. Please resolve the merge conflicts.

@asajeffrey asajeffrey force-pushed the asajeffrey:cross-origin-parentage-test branch from 36f7663 to 4477d80 Jun 9, 2016
@asajeffrey
Copy link
Member Author

asajeffrey commented Jun 9, 2016

Rebased.

@@ -266,6 +266,10 @@
"url": "/html-media-capture/capture_video_cancel-manual.html"
},
{
"path": "html/browsers/history/joint-session-history/joint-session-history-only-fully-active.html",

This comment has been minimized.

@cbrewster

cbrewster Jun 10, 2016

Member

Should these lines be removed after moving the test?

This comment has been minimized.

@asajeffrey

asajeffrey Jun 10, 2016

Author Member

Good catch, I think this comes from juggling several PRs at once, and having files leak from one branch to the other.

@@ -36026,7 +36030,9 @@
]
},
"local_changes": {
"deleted": [],
"deleted": [

This comment has been minimized.

@cbrewster

cbrewster Jun 10, 2016

Member

Same as above

This comment has been minimized.

@asajeffrey

asajeffrey Jun 10, 2016

Author Member

Ditto.

@cbrewster
Copy link
Member

cbrewster commented Jun 10, 2016

This looks good except possibly the changes on MANIFEST.json.

-S-awaiting-review +S-awaiting-answer

Previously, asajeffrey (Alan Jeffrey) wrote…

Rebased.


Reviewed 3 of 9 files at r1, 10 of 12 files at r2.
Review status: 4 of 5 files reviewed at latest revision, 3 unresolved discussions.


Comments from Reviewable

@asajeffrey asajeffrey force-pushed the asajeffrey:cross-origin-parentage-test branch from 4477d80 to 07ea9e6 Jun 10, 2016
@asajeffrey
Copy link
Member Author

asajeffrey commented Jun 10, 2016

Fixed MANIFEST.json. @bors-servo: r=ConnorGBrewster

@bors-servo
Copy link
Contributor

bors-servo commented Jun 10, 2016

📌 Commit 07ea9e6 has been approved by ConnorGBrewster

@bors-servo
Copy link
Contributor

bors-servo commented Jun 11, 2016

Testing commit 07ea9e6 with merge cd0cb71...

bors-servo added a commit that referenced this pull request Jun 11, 2016
…orGBrewster

Added tests for cross-origin iframe parentage.

<!-- Please describe your changes on the following line: -->
Added (currently failing) tests for cross-origin iframe parentage.

---
<!-- 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
- [X] These changes fix #11478
- [X] There are tests for these changes

<!-- 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="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11666)
<!-- Reviewable:end -->
@asajeffrey
Copy link
Member Author

asajeffrey commented Jun 11, 2016

Gosh this is a sad PR.

@Manishearth
Copy link
Member

Manishearth commented Jun 11, 2016

Fails /semantics/embedded-content/the-iframe-element/change_parentage.html on the waterfall it seems

http://build.servo.org/builders/linux-rel/builds/1601

@bors-servo
Copy link
Contributor

bors-servo commented Jun 11, 2016

💔 Test failed - mac-rel-wpt

@highfive
Copy link

highfive commented Jun 11, 2016

  ▶ TIMEOUT [expected OK] /dom/nodes/Document-contentType/contentType/contenttype_xml.html

  ▶ TIMEOUT [expected OK] /dom/nodes/Document-contentType/contentType/createDocument.html

  ▶ TIMEOUT [expected OK] /dom/nodes/Document-contentType/contentType/createHTMLDocument.html

  ▶ TIMEOUT [expected OK] /dom/nodes/Document-contentType/contentType/xhr_responseType_document.html

  ▶ TIMEOUT [expected OK] /dom/nodes/Document-createAttribute.html

  ▶ TIMEOUT [expected OK] /dom/nodes/Document-createComment.html

  ▶ TIMEOUT [expected OK] /dom/nodes/Document-createElement.html

  ▶ TIMEOUT [expected OK] /dom/nodes/Document-createElementNS.html

  ▶ TIMEOUT [expected OK] /dom/nodes/Document-createEvent.html

  ▶ TIMEOUT [expected OK] /dom/nodes/Document-createProcessingInstruction-xhtml.xhtml

  ▶ TIMEOUT [expected OK] /dom/nodes/Document-createTextNode.html

  ▶ TIMEOUT [expected OK] /dom/nodes/Document-createProcessingInstruction.html

  ▶ TIMEOUT [expected OK] /dom/nodes/Document-createTreeWalker.html

  ▶ TIMEOUT [expected OK] /dom/nodes/Document-doctype.html

  ▶ Unexpected subtest result in /webgl/conformance-1.0.3/conformance/rendering/gl-scissor-canvas-dimensions.html:
  │ FAIL [expected PASS] WebGL test #4: at (3, 16) expected: 0,0,0,0 was 0,0,224,207
  │   → assert_true: at (3, 16) expected: 0,0,0,0 was 0,0,224,207 expected true got false
  │ 
  │ reportTestResultsToHarness/&lt;@http://web-platform.test:8000/webgl/conformance-1.0.3/resources/js-test-pre.js:87:9
  │ Test.prototype.step@http://web-platform.test:8000/resources/testharness.js:1397:20
  │ test@http://web-platform.test:8000/resources/testharness.js:495:9
  │ reportTestResultsToHarness@http://web-platform.test:8000/webgl/conformance-1.0.3/resources/js-test-pre.js:86:7
  │ testFailed@http://web-platform.test:8000/webgl/conformance-1.0.3/resources/js-test-pre.js:152:5
  │ checkCanvasRectColor@http://web-platform.test:8000/webgl/conformance-1.0.3/conformance/resources/webgl-test-utils.js:1046:9
  │ checkCanvasRect@http://web-platform.test:8000/webgl/conformance-1.0.3/conformance/resources/webgl-test-utils.js:1072:3
  │ testCanvasSizeChange@http://web-platform.test:8000/webgl/conformance-1.0.3/conformance/rendering/gl-scissor-canvas-dimensions.html:36:3
  └ @http://web-platform.test:8000/webgl/conformance-1.0.3/conformance/rendering/gl-scissor-canvas-dimensions.html:42:1
@cbrewster
Copy link
Member

cbrewster commented Jun 12, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Jun 12, 2016

Testing commit 07ea9e6 with merge 037ada6...

bors-servo added a commit that referenced this pull request Jun 12, 2016
…orGBrewster

Added tests for cross-origin iframe parentage.

<!-- Please describe your changes on the following line: -->
Added (currently failing) tests for cross-origin iframe parentage.

---
<!-- 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
- [X] These changes fix #11478
- [X] There are tests for these changes

<!-- 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="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11666)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jun 12, 2016

💔 Test failed - linux-rel

@highfive
Copy link

highfive commented Jun 12, 2016

  ▶ FAIL [expected PASS] /css-transforms-1_dev/html/transform-abspos-007.htm
  └   → /css-transforms-1_dev/html/transform-abspos-007.htm 71f0313eedfbfcce0b0fcc5ae55f34b1daa3b8d8
/css-transforms-1_dev/html/reference/transform-abspos-ref.htm 78d197606924062e8dd2a773c977afcecf8940f8
Testing 71f0313eedfbfcce0b0fcc5ae55f34b1daa3b8d8 == 78d197606924062e8dd2a773c977afcecf8940f8

  ▶ FAIL [expected PASS] /css-transforms-1_dev/html/transform-table-007.htm
  └   → /css-transforms-1_dev/html/transform-table-007.htm a5c014b20ef1363bea6f24eda28c7efb7c45698a
/css-transforms-1_dev/html/reference/transform-blank-ref.htm fa6407b1acbbfea27e27061e7d1bdeca98e4a728
Testing a5c014b20ef1363bea6f24eda28c7efb7c45698a == fa6407b1acbbfea27e27061e7d1bdeca98e4a728
@cbrewster
Copy link
Member

cbrewster commented Jun 12, 2016

bors-servo added a commit that referenced this pull request Jun 12, 2016
…orGBrewster

Added tests for cross-origin iframe parentage.

<!-- Please describe your changes on the following line: -->
Added (currently failing) tests for cross-origin iframe parentage.

---
<!-- 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
- [X] These changes fix #11478
- [X] There are tests for these changes

<!-- 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="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11666)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jun 12, 2016

Testing commit 07ea9e6 with merge 0b2cc91...

@bors-servo
Copy link
Contributor

bors-servo commented Jun 12, 2016

💔 Test failed - mac-rel-css

@cbrewster
Copy link
Member

cbrewster commented Jun 12, 2016

@bors-servo retry

  • Infra (git)
@bors-servo
Copy link
Contributor

bors-servo commented Jun 12, 2016

Previous build results for android, arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-wpt, windows are reusable. Rebuilding only mac-rel-css...

@bors-servo
Copy link
Contributor

bors-servo commented Jun 12, 2016

@bors-servo bors-servo merged commit 07ea9e6 into servo:master Jun 12, 2016
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

8 participants
You can’t perform that action at this time.