mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Replace reftest with a problematic file name with a unit test.
Fix #7609, "error: unable to create file tests/ref/hello_a?foo#bar.html (Invalid argument)" during git checkout on Windows. Behavior change: passing an nonexistent file name on the command line now shows a blank page (like network errors) rather than exit with an error message.
This commit is contained in:
parent
8d7ba12f28
commit
43c999905c
6 changed files with 53 additions and 30 deletions
|
@ -14,7 +14,7 @@ use prefs;
|
|||
use std::cmp;
|
||||
use std::default::Default;
|
||||
use std::env;
|
||||
use std::fs::{File, PathExt};
|
||||
use std::fs::File;
|
||||
use std::io::{self, Read, Write};
|
||||
use std::path::Path;
|
||||
use std::process;
|
||||
|
@ -485,18 +485,8 @@ pub fn from_cmdline_args(args: &[String]) {
|
|||
print_usage(app_name, &opts);
|
||||
args_fail("servo asks that you provide a URL")
|
||||
} else {
|
||||
let ref url = opt_match.free[0];
|
||||
match Url::parse(url) {
|
||||
Ok(url) => url,
|
||||
Err(url::ParseError::RelativeUrlWithoutBase) => {
|
||||
if Path::new(url).exists() {
|
||||
Url::from_file_path(&*cwd.join(url)).unwrap()
|
||||
} else {
|
||||
args_fail(&format!("File not found: {}", url))
|
||||
}
|
||||
}
|
||||
Err(_) => panic!("URL parsing failed"),
|
||||
}
|
||||
parse_url_or_filename(&cwd, &opt_match.free[0])
|
||||
.unwrap_or_else(|()| args_fail("URL parsing failed"))
|
||||
};
|
||||
|
||||
let tile_size: usize = match opt_match.opt_str("s") {
|
||||
|
@ -663,3 +653,13 @@ pub fn set_defaults(opts: Opts) {
|
|||
pub fn get() -> &'static Opts {
|
||||
&OPTIONS
|
||||
}
|
||||
|
||||
pub fn parse_url_or_filename(cwd: &Path, input: &str) -> Result<Url, ()> {
|
||||
match Url::parse(input) {
|
||||
Ok(url) => Ok(url),
|
||||
Err(url::ParseError::RelativeUrlWithoutBase) => {
|
||||
Ok(Url::from_file_path(&*cwd.join(input)).unwrap())
|
||||
}
|
||||
Err(_) => Err(()),
|
||||
}
|
||||
}
|
||||
|
|
|
@ -125,7 +125,6 @@ prefs:"layout.flex.enabled" == flex_row_direction.html flex_row_direction_ref.ht
|
|||
== font_style.html font_style_ref.html
|
||||
== height_compute_reset.html height_compute.html
|
||||
# `?` and `#` in the name is a test for https://github.com/servo/servo/issues/3340
|
||||
== hello_a?foo#bar.html hello_b.html
|
||||
== hide_after_create.html hide_after_create_ref.html
|
||||
|
||||
== iframe/bg_color.html iframe/bg_color_ref.html
|
||||
|
|
|
@ -1,8 +0,0 @@
|
|||
<html>
|
||||
<head>
|
||||
<title>hello</title>
|
||||
</head>
|
||||
<body>
|
||||
<strong>Hello!</strong>
|
||||
</body>
|
||||
</html>
|
|
@ -1,8 +0,0 @@
|
|||
<html>
|
||||
<head>
|
||||
<title>hello</title>
|
||||
</head>
|
||||
<body>
|
||||
<b>Hello!</b>
|
||||
</body>
|
||||
</html>
|
|
@ -14,3 +14,4 @@ extern crate euclid;
|
|||
#[cfg(test)] mod vec;
|
||||
#[cfg(test)] mod mem;
|
||||
#[cfg(test)] mod str;
|
||||
#[cfg(test)] mod opts;
|
||||
|
|
39
tests/unit/util/opts.rs
Normal file
39
tests/unit/util/opts.rs
Normal file
|
@ -0,0 +1,39 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use std::path::Path;
|
||||
use util::opts::parse_url_or_filename;
|
||||
|
||||
#[test]
|
||||
fn test_argument_parsing() {
|
||||
let fake_cwd = Path::new("/fake/cwd");
|
||||
assert!(parse_url_or_filename(fake_cwd, "http://example.net:invalid").is_err());
|
||||
|
||||
let url = parse_url_or_filename(fake_cwd, "http://example.net").unwrap();
|
||||
assert_eq!(url.scheme, "http");
|
||||
|
||||
let url = parse_url_or_filename(fake_cwd, "file:///foo/bar.html").unwrap();
|
||||
assert_eq!(url.scheme, "file");
|
||||
assert_eq!(url.path().unwrap(), ["foo", "bar.html"]);
|
||||
|
||||
let url = parse_url_or_filename(fake_cwd, "bar.html").unwrap();
|
||||
assert_eq!(url.scheme, "file");
|
||||
assert_eq!(url.path().unwrap(), ["fake", "cwd", "bar.html"]);
|
||||
|
||||
// '?' and '#' have a special meaning in URLs...
|
||||
let url = parse_url_or_filename(fake_cwd, "file:///foo/bar?baz#buzz.html").unwrap();
|
||||
assert_eq!(&*url.to_file_path().unwrap(), Path::new("/foo/bar"));
|
||||
assert_eq!(url.scheme, "file");
|
||||
assert_eq!(url.path().unwrap(), ["foo", "bar"]);
|
||||
assert_eq!(url.query.unwrap(), "baz");
|
||||
assert_eq!(url.fragment.unwrap(), "buzz.html");
|
||||
|
||||
// but not in file names.
|
||||
let url = parse_url_or_filename(fake_cwd, "./bar?baz#buzz.html").unwrap();
|
||||
assert_eq!(&*url.to_file_path().unwrap(), Path::new("/fake/cwd/bar?baz#buzz.html"));
|
||||
assert_eq!(url.scheme, "file");
|
||||
assert_eq!(url.path().unwrap(), ["fake", "cwd", "bar%3Fbaz%23buzz.html"]);
|
||||
assert!(url.query.is_none());
|
||||
assert!(url.fragment.is_none());
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue