From 5ccdeb46b82b18bd58b726a7f1b5c8024cb0c20b Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Sun, 9 Feb 2020 10:55:45 +1000 Subject: [PATCH] check [ instead of con in unit test, so test works on Windows as well --- rslib/src/media/check.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rslib/src/media/check.rs b/rslib/src/media/check.rs index bbe015469..193cc7e95 100644 --- a/rslib/src/media/check.rs +++ b/rslib/src/media/check.rs @@ -211,7 +211,7 @@ mod test { fs::write(&mgr.media_folder.join("zerobytes"), "")?; fs::create_dir(&mgr.media_folder.join("folder"))?; fs::write(&mgr.media_folder.join("normal.jpg"), "normal")?; - fs::write(&mgr.media_folder.join("con.jpg"), "con")?; + fs::write(&mgr.media_folder.join("foo[.jpg"), "foo")?; let progress = |_n| true; let mut checker = MediaChecker::new(&mgr, progress); @@ -221,18 +221,18 @@ mod test { assert_eq!( output, MediaCheckOutput { - files: vec!["con_.jpg".to_string(), "normal.jpg".to_string()], + files: vec!["foo.jpg".to_string(), "normal.jpg".to_string()], renamed: vec![RenamedFile { - current_fname: "con_.jpg".to_string(), - original_fname: "con.jpg".to_string() + current_fname: "foo.jpg".to_string(), + original_fname: "foo[.jpg".to_string() }], dirs: vec!["folder".to_string()], oversize: vec![] } ); - assert!(fs::metadata(&mgr.media_folder.join("con.jpg")).is_err()); - assert!(fs::metadata(&mgr.media_folder.join("con_.jpg")).is_ok()); + assert!(fs::metadata(&mgr.media_folder.join("foo[.jpg")).is_err()); + assert!(fs::metadata(&mgr.media_folder.join("foo.jpg")).is_ok()); Ok(()) }