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

Implements Node::isSameNode #10761

Merged
merged 1 commit into from Apr 25, 2016
Merged

Implements Node::isSameNode #10761

merged 1 commit into from Apr 25, 2016

Conversation

@amarant
Copy link
Contributor

amarant commented Apr 20, 2016

Fixes #10746

I adapted the tests from dom/nodes/Node-isEqualNode.html
should I also add ones for xhtml too like here : dom/nodes/Node-isEqualNode-xhtml.xhtml ?


This change is Reviewable

@highfive
Copy link

highfive commented Apr 20, 2016

Heads up! This PR modifies the following files:

  • @KiChjang: components/script/dom/node.rs, components/script/dom/webidls/Node.webidl
@Ms2ger
Copy link
Contributor

Ms2ger commented Apr 21, 2016

@bors-servo try

No, this is more than enough. You will need to update some expectations for interfaces.html (as reported by bors; let me know if you need help) and rebase over #10777, but otherwise this is good to go.

@bors-servo
Copy link
Contributor

bors-servo commented Apr 21, 2016

Trying commit 21e3765 with merge 8646e6e...

bors-servo added a commit that referenced this pull request Apr 21, 2016
Implements Node::isSameNode

Fixes #10746

I adapted the tests from dom/nodes/Node-isEqualNode.html
should I also add ones for xhtml too like here : dom/nodes/Node-isEqualNode-xhtml.xhtml ?

<!-- 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/10761)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Apr 21, 2016

💔 Test failed - linux-rel

@Ms2ger
Copy link
Contributor

Ms2ger commented Apr 21, 2016

  ▶ Unexpected subtest result in /dom/interfaces.html:
  └ PASS [expected FAIL] Node interface: operation isSameNode(Node)

  ▶ Unexpected subtest result in /dom/interfaces.html:
  └ PASS [expected FAIL] Node interface: new Document() must inherit property "isSameNode" with the proper type (31)

  ▶ Unexpected subtest result in /dom/interfaces.html:
  └ PASS [expected FAIL] Node interface: calling isSameNode(Node) on new Document() with too few arguments must throw TypeError

  ▶ Unexpected subtest result in /dom/interfaces.html:
  └ PASS [expected FAIL] Node interface: xmlDoc must inherit property "isSameNode" with the proper type (31)

  ▶ Unexpected subtest result in /dom/interfaces.html:
  └ PASS [expected FAIL] Node interface: calling isSameNode(Node) on xmlDoc with too few arguments must throw TypeError

  ▶ Unexpected subtest result in /dom/interfaces.html:
  └ PASS [expected FAIL] Node interface: document.doctype must inherit property "isSameNode" with the proper type (31)

  ▶ Unexpected subtest result in /dom/interfaces.html:
  └ PASS [expected FAIL] Node interface: calling isSameNode(Node) on document.doctype with too few arguments must throw TypeError

  ▶ Unexpected subtest result in /dom/interfaces.html:
  └ PASS [expected FAIL] Node interface: document.createDocumentFragment() must inherit property "isSameNode" with the proper type (31)

  ▶ Unexpected subtest result in /dom/interfaces.html:
  └ PASS [expected FAIL] Node interface: calling isSameNode(Node) on document.createDocumentFragment() with too few arguments must throw TypeError

  ▶ Unexpected subtest result in /dom/interfaces.html:
  └ PASS [expected FAIL] Node interface: element must inherit property "isSameNode" with the proper type (31)

  ▶ Unexpected subtest result in /dom/interfaces.html:
  └ PASS [expected FAIL] Node interface: calling isSameNode(Node) on element with too few arguments must throw TypeError

  ▶ Unexpected subtest result in /dom/interfaces.html:
  └ PASS [expected FAIL] Node interface: document.createTextNode("abc") must inherit property "isSameNode" with the proper type (31)

  ▶ Unexpected subtest result in /dom/interfaces.html:
  └ PASS [expected FAIL] Node interface: calling isSameNode(Node) on document.createTextNode("abc") with too few arguments must throw TypeError

  ▶ Unexpected subtest result in /dom/interfaces.html:
  └ PASS [expected FAIL] Node interface: xmlDoc.createProcessingInstruction("abc", "def") must inherit property "isSameNode" with the proper type (31)

  ▶ Unexpected subtest result in /dom/interfaces.html:
  └ PASS [expected FAIL] Node interface: calling isSameNode(Node) on xmlDoc.createProcessingInstruction("abc", "def") with too few arguments must throw TypeError

  ▶ Unexpected subtest result in /dom/interfaces.html:
  └ PASS [expected FAIL] Node interface: document.createComment("abc") must inherit property "isSameNode" with the proper type (31)

  ▶ Unexpected subtest result in /dom/interfaces.html:
  └ PASS [expected FAIL] Node interface: calling isSameNode(Node) on document.createComment("abc") with too few arguments must throw TypeError

(scroll-to-top.html is an intermittent)

@bors-servo
Copy link
Contributor

bors-servo commented Apr 21, 2016

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

@amarant amarant force-pushed the amarant:Node-isSameNode branch from 21e3765 to dee4d60 Apr 21, 2016
@amarant
Copy link
Contributor Author

amarant commented Apr 21, 2016

I don't understand what went wrong ?

@jdm
Copy link
Member

jdm commented Apr 21, 2016

All of those PASS [expected FAIL] bits are tests that did not succeed before your changes. The text expectation files need to be updated to reflect the fact that they are now expected to succeed.

@amarant
Copy link
Contributor Author

amarant commented Apr 21, 2016

This is what I did with my last commit ammend, but the travis error of the new CI build is strange :

Broadcast message from root@testing-gce-d1d1ce5e-48cd-4e0b-875f-29503086cd6b (unknown) at 19:12 ... The system is going down for power off NOW! No output has been received in the last 10m0s, this potentially indicates a stalled build or something wrong with the build itself. The build has been terminated

@jdm
Copy link
Member

jdm commented Apr 21, 2016

I restarted it.

@Ms2ger
Copy link
Contributor

Ms2ger commented Apr 22, 2016

Looks good, but needs a rebase.

@bors-servo
Copy link
Contributor

bors-servo commented Apr 22, 2016

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

Fixes #10746

Adapted the tests from dom/nodes/Node-isEqualNode.html
@amarant amarant force-pushed the amarant:Node-isSameNode branch from dee4d60 to ed42cc7 Apr 23, 2016
@Ms2ger
Copy link
Contributor

Ms2ger commented Apr 25, 2016

@bors-servo r+

Thanks!

@bors-servo
Copy link
Contributor

bors-servo commented Apr 25, 2016

📌 Commit ed42cc7 has been approved by Ms2ger

@bors-servo
Copy link
Contributor

bors-servo commented Apr 25, 2016

Testing commit ed42cc7 with merge 4f05ea7...

bors-servo added a commit that referenced this pull request Apr 25, 2016
Implements Node::isSameNode

Fixes #10746

I adapted the tests from dom/nodes/Node-isEqualNode.html
should I also add ones for xhtml too like here : dom/nodes/Node-isEqualNode-xhtml.xhtml ?

<!-- 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/10761)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Apr 25, 2016

@bors-servo bors-servo merged commit ed42cc7 into servo:master Apr 25, 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
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.

None yet

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