Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Instead of panicking on broken url, break from the loop and return.
- Loading branch information
Showing
3 changed files
with
11 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 4 additions & 1 deletion
5
...wpt/metadata/html/browsers/history/the-location-interface/security_location_0.sub.htm.ini
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,6 @@ | ||
[security_location_0.sub.htm] | ||
type: testharness | ||
expected: CRASH | ||
expected: TIMEOUT | ||
[Accessing location object from different origins doesn\'t raise SECURITY_ERR exception] | ||
expected: NOTRUN | ||
5 changes: 4 additions & 1 deletion
5
...wpt/metadata/html/browsers/the-window-object/security-window/window-security.sub.html.ini
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,6 @@ | ||
[window-security.sub.html] | ||
type: testharness | ||
expected: CRASH | ||
expected: TIMEOUT | ||
[Window Security testing] | ||
expected: NOTRUN | ||
|
4e9bb15
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
r=jdm
4e9bb15
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from jdm
at 4e9bb15
4e9bb15
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging servo/servo/load-failure-panic = 4e9bb15 into auto
4e9bb15
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
servo/servo/load-failure-panic = 4e9bb15 merged ok, testing candidate = 6824bc9
4e9bb15
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all tests pass:
success: http://build.servo.org/builders/linux1/builds/1242
success: http://build.servo.org/builders/linux2/builds/1240
success: http://build.servo.org/builders/android/builds/1276
success: http://build.servo.org/builders/mac1/builds/1455
success: http://build.servo.org/builders/mac2/builds/1458
success: http://build.servo.org/builders/gonk/builds/421
4e9bb15
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fast-forwarding master to auto = 6824bc9