Просмотр исходного кода

test: don't compile test for #197 on windows.

Windows expects in `path_to_file_url_segments_windows` a Disk or a VerbatimDisk
as the first path component, which this test doesn't hold, and thus it panic.

I sincerely don't know how this could pass in the first time (did it?).
Emilio Cobos Álvarez 10 лет назад
Родитель
Сommit
4d4f1a399b
2 измененных файлов с 6 добавлено и 5 удалено
  1. 2 2
      src/lib.rs
  2. 4 3
      tests/unit.rs

+ 2 - 2
src/lib.rs

@@ -326,7 +326,7 @@ impl Url {
             } else {
                 assert_eq!(self.byte_at(self.host_end), b':');
                 let port_str = self.slice(self.host_end + 1..self.path_start);
-                assert_eq!(self.port, Some(port_str.parse::<u16>().unwrap()));
+                assert_eq!(self.port, Some(port_str.parse::<u16>().expect("Couldn't parse port?")));
             }
             assert_eq!(self.byte_at(self.path_start), b'/');
         } else {
@@ -350,7 +350,7 @@ impl Url {
             assert!(fragment_start > query_start);
         }
 
-        let other = Url::parse(self.as_str()).unwrap();
+        let other = Url::parse(self.as_str()).expect("Failed to parse myself?");
         assert_eq!(&self.serialization, &other.serialization);
         assert_eq!(self.scheme_end, other.scheme_end);
         assert_eq!(self.username_end, other.username_end);

+ 4 - 3
tests/unit.rs

@@ -261,12 +261,13 @@ fn issue_61() {
 }
 
 #[test]
+#[cfg(not(windows))]
 /// https://github.com/servo/rust-url/issues/197
 fn issue_197() {
-    let mut url = Url::from_file_path("/").unwrap();
+    let mut url = Url::from_file_path("/").expect("Failed to parse path");
     url.assert_invariants();
-    assert_eq!(url, Url::parse("file:///").unwrap());
-    url.path_segments_mut().unwrap().pop_if_empty();
+    assert_eq!(url, Url::parse("file:///").expect("Failed to parse path + protocol"));
+    url.path_segments_mut().expect("path_segments_mut").pop_if_empty();
 }
 
 #[test]