Auto merge of #26465 - utsavoza:ugo/issue-26287/06-05-2020, r=jdm

Bump rust-url from 2.1.0 to 2.1.1 - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix (partially) #26287 - [x] There are tests for these changes
servo · May 7, 2020 · 033156b · 033156b
2 parents 6aec2c8 + 2530028
commit 033156b
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 1,054 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/...rowsers/history/the-location-interface/location-protocol-setter-non-broken-weird.html.ini b/...rowsers/history/the-location-interface/location-protocol-setter-non-broken-weird.html.ini
@@ -0,0 +1,5 @@
+[location-protocol-setter-non-broken-weird.html]
+  type: testharness
+  [Set location.protocol to x]
+    expected: FAIL
+
diff --git a/...html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini b/...html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
@@ -6,3 +6,14 @@
   [Set data URL frame location.protocol to file]
     expected: FAIL
 
+  [Set HTTP URL frame location.protocol to x]
+    expected: FAIL
+
+  [Set HTTP URL frame location.protocol to data]
+    expected: FAIL
+
+  [Set HTTP URL frame location.protocol to file]
+    expected: FAIL
+
+  [Set HTTP URL frame location.protocol to http+x]
+    expected: FAIL
diff --git a/...t/metadata/html/browsers/history/the-location-interface/location-protocol-setter.html.ini b/...t/metadata/html/browsers/history/the-location-interface/location-protocol-setter.html.ini
@@ -1,62 +1,5 @@
 [location-protocol-setter.html]
   type: testharness
-  [%00x (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [%01x (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [%0Ax (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [%20x (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [%EF%BF%BD%EF%BF%BD%EF%BF%BDx (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [%00X (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [%01X (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [%0AX (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [%20X (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [x%00 (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [x%01 (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [x%0A (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [x%20 (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [X%00 (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [X%01 (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [X%0A (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [X%20 (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [a%0A (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [a+-.%0A (percent-encoded) is not a scheme]
-    expected: FAIL
-
   [Equivalent tests for data URL and srcdoc <iframe>s]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/history/the-location-interface/location_hash.html.ini b/tests/wpt/metadata/html/browsers/history/the-location-interface/location_hash.html.ini
diff --git a/tests/wpt/metadata/url/a-element-xhtml.xhtml.ini b/tests/wpt/metadata/url/a-element-xhtml.xhtml.ini
@@ -1,101 +1,5 @@
 [a-element-xhtml.xhtml]
   type: testharness
-  [Parsing: <foo://> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <sc://@/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://te@s:t@/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://:/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://:12/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://ñ> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://ñ?x> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://ñ#x> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <#x> against <sc://ñ>]
-    expected: FAIL
-
-  [Parsing: <?x> against <sc://ñ>]
-    expected: FAIL
-
-  [Parsing: <sc://?> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://#> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <////> against <sc://x/>]
-    expected: FAIL
-
-  [Parsing: <////x/> against <sc://x/>]
-    expected: FAIL
-
-  [Parsing: <file:\\\\//> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <file:\\\\\\\\> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <file:\\\\\\\\?fox> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <file:\\\\\\\\#guppy> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <file://spider///> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <file:\\\\localhost//> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <file://\\/localhost//cat> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <file://localhost//a//../..//> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: </////mouse> against <file:///elephant>]
-    expected: FAIL
-
-  [Parsing: <\\/localhost//pig> against <file://lion/>]
-    expected: FAIL
-
-  [Parsing: <//localhost//pig> against <file://lion/>]
-    expected: FAIL
-
-  [Parsing: </..//localhost//pig> against <file://lion/>]
-    expected: FAIL
-
-  [Parsing: </rooibos> against <file://tea/>]
-    expected: FAIL
-
-  [Parsing: </?chai> against <file://tea/>]
-    expected: FAIL
-
-  [Parsing: <C|> against <file://host/dir/file>]
-    expected: FAIL
-
-  [Parsing: </c:/foo/bar> against <file:///c:/baz/qux>]
-    expected: FAIL
-
-  [Parsing: </c|/foo/bar> against <file:///c:/baz/qux>]
-    expected: FAIL
-
-  [Parsing: <file:\\c:\\foo\\bar> against <file:///c:/baz/qux>]
-    expected: FAIL
-
   [Parsing: <test-a.html> against <a>]
     expected: FAIL
 
@@ -105,51 +9,6 @@
   [Parsing: <test-a-slash-slash.html> against <a//>]
     expected: FAIL
 
-  [Parsing: <http://f:21/ b ? d # e > against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <lolscheme:x x#x x> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://www.google.com/foo?bar=baz# »> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <data:test# »> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://foo.bar/baz?qux#foo"bar> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://foo.bar/baz?qux#foo<bar> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://foo.bar/baz?qux#foo>bar> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://foo.bar/baz?qux#foo`bar> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://ñ> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://ñ#x> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://www.google.com/foo?bar=baz# »> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <data:test# »> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://ñ?x> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <?x> against <sc://ñ>]
-    expected: FAIL
-
-  [Parsing: <#x> against <sc://ñ>]
-    expected: FAIL
-
   [Parsing: <gopher:example.com/> against <http://example.org/foo/bar>]
     expected: FAIL