From 42f7abf2f54700507bc04a8912b13297e5985bda Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Fri, 17 Jan 2020 21:04:39 +0100 Subject: [PATCH] for test_selfavatar*(), use the same function signature as for other tests --- src/config.rs | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/config.rs b/src/config.rs index 695b0aae2..4bc1b1058 100644 --- a/src/config.rs +++ b/src/config.rs @@ -212,32 +212,38 @@ mod tests { } #[test] - fn test_selfavatar_outside_blobdir() -> failure::Fallible<()> { + fn test_selfavatar_outside_blobdir() { let t = dummy_context(); let avatar_src = t.dir.path().join("avatar.jpg"); let avatar_bytes = include_bytes!("../test-data/image/avatar1000x1000.jpg"); - File::create(&avatar_src)?.write_all(avatar_bytes)?; + File::create(&avatar_src) + .unwrap() + .write_all(avatar_bytes) + .unwrap(); let avatar_blob = t.ctx.get_blobdir().join("avatar.jpg"); assert!(!avatar_blob.exists()); t.ctx - .set_config(Config::Selfavatar, Some(&avatar_src.to_str().unwrap()))?; + .set_config(Config::Selfavatar, Some(&avatar_src.to_str().unwrap())) + .unwrap(); assert!(avatar_blob.exists()); assert!(std::fs::metadata(&avatar_blob).unwrap().len() < avatar_bytes.len() as u64); let avatar_cfg = t.ctx.get_config(Config::Selfavatar); assert_eq!(avatar_cfg, avatar_blob.to_str().map(|s| s.to_string())); - Ok(()) } #[test] - fn test_selfavatar_in_blobdir() -> failure::Fallible<()> { + fn test_selfavatar_in_blobdir() { let t = dummy_context(); let avatar_src = t.ctx.get_blobdir().join("avatar.jpg"); let avatar_bytes = include_bytes!("../test-data/image/avatar1000x1000.jpg"); - File::create(&avatar_src)?.write_all(avatar_bytes)?; + File::create(&avatar_src) + .unwrap() + .write_all(avatar_bytes) + .unwrap(); t.ctx - .set_config(Config::Selfavatar, Some(&avatar_src.to_str().unwrap()))?; + .set_config(Config::Selfavatar, Some(&avatar_src.to_str().unwrap())) + .unwrap(); let avatar_cfg = t.ctx.get_config(Config::Selfavatar); assert_eq!(avatar_cfg, avatar_src.to_str().map(|s| s.to_string())); - Ok(()) } }