Update url, num_cpus, heapsize, webdriver.

servo · Jan 6, 2017 · 6f3831b · 6f3831b
1 parent 85d3bbd
commit 6f3831b
Show file tree

Hide file tree

Showing 11 changed files with 58 additions and 138 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/webdriver_server/Cargo.toml b/components/webdriver_server/Cargo.toml
@@ -26,4 +26,4 @@ servo_config = {path = "../config", features = ["servo"]}
 servo_url = {path = "../url", features = ["servo"]}
 url = {version = "1.2", features = ["heap_size"]}
 uuid = { version = "0.3.1", features = ["v4"] }
-webdriver = "0.15"
+webdriver = "0.17"
diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs
@@ -89,7 +89,7 @@ pub fn start_server(port: u16, constellation_chan: Sender<ConstellationMsg>) {
     let handler = Handler::new(constellation_chan);
     thread::Builder::new().name("WebdriverHttpServer".to_owned()).spawn(move || {
         let address = SocketAddrV4::new("0.0.0.0".parse().unwrap(), port);
-        match server::start(SocketAddr::V4(address), handler, extension_routes()) {
+        match server::start(SocketAddr::V4(address), handler, &extension_routes()) {
             Ok(listening) => info!("WebDriver server listening on {}", listening.socket),
             Err(_) => panic!("Unable to start WebDriver HTTPD server"),
          }

diff --git a/tests/wpt/metadata/eventsource/request-cache-control.htm.ini b/tests/wpt/metadata/eventsource/request-cache-control.htm.ini
@@ -3,3 +3,4 @@
   expected: TIMEOUT
   [EventSource: Cache-Control 1]
     expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/url/a-element-origin-xhtml.xhtml.ini b/tests/wpt/metadata/url/a-element-origin-xhtml.xhtml.ini
diff --git a/tests/wpt/metadata/url/a-element-origin.html.ini b/tests/wpt/metadata/url/a-element-origin.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,23 +1,5 @@
 [a-element-xhtml.xhtml]
   type: testharness
-  [Parsing: <http://[::127.0.0.1\]> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <http://[0:0:0:0:0:0:13.1.68.3\]> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <#β> against <http://example.org/foo/bar>]
-    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\x08bar> against <about:blank>]
-    expected: FAIL
-
   [Parsing: <http://10000000000> against <http://other.com/>]
     expected: FAIL
 

diff --git a/tests/wpt/metadata/url/a-element.html.ini b/tests/wpt/metadata/url/a-element.html.ini
@@ -1,23 +1,5 @@
 [a-element.html]
   type: testharness
-  [Parsing: <http://[::127.0.0.1\]> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <http://[0:0:0:0:0:0:13.1.68.3\]> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <#β> against <http://example.org/foo/bar>]
-    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\x08bar> against <about:blank>]
-    expected: FAIL
-
   [Parsing: <http://10000000000> against <http://other.com/>]
     expected: FAIL
 

diff --git a/tests/wpt/metadata/url/url-constructor.html.ini b/tests/wpt/metadata/url/url-constructor.html.ini
@@ -1,20 +1,5 @@
 [url-constructor.html]
   type: testharness
-  [Parsing: <http://[::127.0.0.1\]> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <http://[0:0:0:0:0:0:13.1.68.3\]> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <#β> against <http://example.org/foo/bar>]
-    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\x08bar> against <about:blank>]
     expected: FAIL
 

diff --git a/tests/wpt/metadata/url/url-origin.html.ini b/tests/wpt/metadata/url/url-origin.html.ini
diff --git a/tests/wpt/metadata/url/url-setters.html.ini b/tests/wpt/metadata/url/url-setters.html.ini
@@ -405,9 +405,3 @@
   [<area>: Setting <a:/>.hash = '\x00\x01\t\n\r\x1f !"#$%&'()*+,-./09:;<=>?@AZ[\\\]^_`az{|}~Éé' Simple percent-encoding; nuls, tabs, and newlines are removed]
     expected: FAIL
 
-  [URL: Setting <http://example.net>.hash = '%c3%89té' Bytes already percent-encoded are left as-is]
-    expected: FAIL
-
-  [<a>: Setting <http://example.net>.hash = '%c3%89té' Bytes already percent-encoded are left as-is]
-    expected: FAIL
-