diff options
| author | Fernando Jiménez Moreno <ferjmoreno@gmail.com> | 2018-11-26 09:54:32 +0100 |
|---|---|---|
| committer | Fernando Jiménez Moreno <ferjmoreno@gmail.com> | 2018-11-26 15:28:27 +0100 |
| commit | b23dd0587b5d31d34915fc3906e550d05108a185 (patch) | |
| tree | 59013df1fdff12f4ebd3312f68d97a1c6acf2c43 | |
| parent | 4561a97309d1b4c6e56dc9bfd51782f40a9c6cba (diff) | |
| download | servo-b23dd0587b5d31d34915fc3906e550d05108a185.tar.gz servo-b23dd0587b5d31d34915fc3906e550d05108a185.zip | |
Add comment about incorrect tests for file url range requests. Fmt and manifest update
| -rw-r--r-- | components/net/fetch/methods.rs | 3 | ||||
| -rw-r--r-- | components/net/tests/fetch.rs | 3 | ||||
| -rw-r--r-- | tests/wpt/mozilla/meta/MANIFEST.json | 22 | ||||
| -rw-r--r-- | tests/wpt/mozilla/tests/mozilla/range_request_file_url.html | 4 |
4 files changed, 19 insertions, 13 deletions
diff --git a/components/net/fetch/methods.rs b/components/net/fetch/methods.rs index bd9dfce2dab..7eb963fcd5e 100644 --- a/components/net/fetch/methods.rs +++ b/components/net/fetch/methods.rs @@ -610,7 +610,8 @@ fn scheme_fetch( Err(_) => None, }; - let mut response = Response::new(url, ResourceFetchTiming::new(request.timing_type())); + let mut response = + Response::new(url, ResourceFetchTiming::new(request.timing_type())); let range_header = request.headers.typed_get::<Range>(); let is_range_request = range_header.is_some(); diff --git a/components/net/tests/fetch.rs b/components/net/tests/fetch.rs index e0311a5e626..6831ca7aa46 100644 --- a/components/net/tests/fetch.rs +++ b/components/net/tests/fetch.rs @@ -36,7 +36,8 @@ use net::test::HttpState; use net_traits::request::{Destination, Origin, RedirectMode, Referrer, Request, RequestMode}; use net_traits::response::{CacheState, Response, ResponseBody, ResponseType}; use net_traits::{ - FetchTaskTarget, IncludeSubdomains, NetworkError, ReferrerPolicy, ResourceFetchTiming, ResourceTimingType, + FetchTaskTarget, IncludeSubdomains, NetworkError, ReferrerPolicy, ResourceFetchTiming, + ResourceTimingType, }; use servo_url::{ImmutableOrigin, ServoUrl}; use std::fs::File; diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index 5233572da7d..66b49e51489 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -14269,13 +14269,13 @@ "/_mozilla/mozilla/range_deleteContents.html", {} ] - ], + ], "mozilla/range_request_blob_url.html": [ [ - "/_mozilla/mozilla/range_request_blob_url.html", + "/_mozilla/mozilla/range_request_blob_url.html", {} ] - ], + ], "mozilla/range_request_file_url.html": [ [ "/_mozilla/mozilla/range_request_file_url.html", @@ -27070,7 +27070,7 @@ "testharness" ], "mozilla/interfaces.html": [ - "ad17e930ddb5bc2daecb86216efe8885ae399173", + "ad17e930ddb5bc2daecb86216efe8885ae399173", "testharness" ], "mozilla/interfaces.js": [ @@ -27078,7 +27078,7 @@ "support" ], "mozilla/interfaces.worker.js": [ - "a5f2e00f234ea66b80e8a9bd4dbbc5433926191f", + "a5f2e00f234ea66b80e8a9bd4dbbc5433926191f", "testharness" ], "mozilla/invalid-this.html": [ @@ -27244,13 +27244,13 @@ "mozilla/range_deleteContents.html": [ "8de03455bcb0d18258f76af20f58c14868fe1c21", "testharness" - ], + ], "mozilla/range_request_blob_url.html": [ - "075397620e989dafc814c0ed2bca46bd476bccf6", + "075397620e989dafc814c0ed2bca46bd476bccf6", "testharness" - ], + ], "mozilla/range_request_file_url.html": [ - "65fe13fe93d97cebc2846ff7d7deab3eb84c1787", + "4fd4ddc8b1a9959e90b243795267c220d6a05f5e", "testharness" ], "mozilla/referrer-policy/OWNERS": [ @@ -32914,11 +32914,11 @@ "testharness" ], "mozilla/window_performance.html": [ - "690870b7080e179481ca0255f7c30337e8b6636a", + "690870b7080e179481ca0255f7c30337e8b6636a", "testharness" ], "mozilla/window_performance_topLevelDomComplete.html": [ - "50bbc2917b5ac900b5061a0b2c30b6c1fef1067e", + "50bbc2917b5ac900b5061a0b2c30b6c1fef1067e", "testharness" ], "mozilla/window_requestAnimationFrame.html": [ diff --git a/tests/wpt/mozilla/tests/mozilla/range_request_file_url.html b/tests/wpt/mozilla/tests/mozilla/range_request_file_url.html index 65fe13fe93d..4fd4ddc8b1a 100644 --- a/tests/wpt/mozilla/tests/mozilla/range_request_file_url.html +++ b/tests/wpt/mozilla/tests/mozilla/range_request_file_url.html @@ -3,6 +3,10 @@ <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> <script> + +// FIXME(ferjm) https://github.com/servo/servo/issues/22269 +// This is not using file:// urls. + [{ file: "resources/range_small.txt", range: "bytes=0-", |