mirrors/m3u8-rs
1
1
Fork 0
mirror of https://github.com/rutgersc/m3u8-rs.git synced 2025-01-03 11:48:41 +00:00
Code Issues Projects Releases Wiki Activity

Make tests run on non-windows machines

Browse source 
Hardcoding the windows path separator isn't a good idea for portability :)
This commit is contained in:
Philippe Normand 2017-11-11 13:02:04 +01:00
parent e18e1d5cd0
commit b5b950150f
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/lib.rs
View file

@ -14,7 +14,8 @@ use nom::*;
use std::collections::HashMap; use std::collections::HashMap;
fn all_sample_m3u_playlists() -> Vec<path::PathBuf> { fn all_sample_m3u_playlists() -> Vec<path::PathBuf> {
fs::read_dir("sample-playlists\\").unwrap() let path: std::path::PathBuf = ["sample-playlists"].iter().collect();
fs::read_dir(path.to_str().unwrap()).unwrap()
.filter_map(Result::ok) .filter_map(Result::ok)
.map(|dir| dir.path()) .map(|dir| dir.path())
.filter(|path| path.extension().map_or(false, |ext| ext == "m3u8")) .filter(|path| path.extension().map_or(false, |ext| ext == "m3u8"))
@ -23,13 +24,14 @@ fn all_sample_m3u_playlists() -> Vec<path::PathBuf> {
fn getm3u(path: &str) -> String { fn getm3u(path: &str) -> String {
let mut buf = String::new(); let mut buf = String::new();
let mut file = fs::File::open(path).expect("Can't find m3u8."); let mut file = fs::File::open(path).expect(&format!("Can't find m3u8: {}", path));
let u = file.read_to_string(&mut buf).expect("Can't read file"); let u = file.read_to_string(&mut buf).expect("Can't read file");
buf buf
} }
fn get_sample_playlist(name: &str) -> String { fn get_sample_playlist(name: &str) -> String {
getm3u(&(String::from("sample-playlists\\") + name)) let path: std::path::PathBuf = ["sample-playlists", name].iter().collect();
getm3u(path.to_str().unwrap())
} }
// ----------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------
@ -389,4 +391,4 @@ fn create_and_parse_media_playlist_full() {
}); });
let playlist_parsed = print_create_and_parse_playlist(&mut playlist_original); let playlist_parsed = print_create_and_parse_playlist(&mut playlist_original);
assert_eq!(playlist_original, playlist_parsed); assert_eq!(playlist_original, playlist_parsed);
} }