From 2d0eb8441a621655a2e0add71049ca4b5e775ca2 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 31 May 2021 23:39:13 +0100 Subject: [PATCH] childio: Break out assert_is_status_1 Signed-off-by: Ian Jackson --- src/childio.rs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/childio.rs b/src/childio.rs index 2be21ef9..2e1c5668 100644 --- a/src/childio.rs +++ b/src/childio.rs @@ -185,10 +185,16 @@ pub mod test { assert_eq!( &w, &[] as &[String] ); } + static ENDING: &str = "exit status: 1"; + + fn assert_is_status_1(e: &io::Error) { + assert_eq!( e.kind(), ErrorKind::Other ); + let es = e.to_string(); + assert!( es.ends_with(ENDING), "actually {:?}", es ); + } + #[test] fn t_false() { - static ENDING: &str = "exit status: 1"; - let setup = ||{ let c = Command::new("false"); run_pair(c, "cat".into()).unwrap() @@ -199,9 +205,7 @@ pub mod test { let r = f(&mut w, &mut r); let e = r.unwrap_err(); - assert_eq!( e.kind(), ErrorKind::Other ); - let es = e.to_string(); - assert!( es.ends_with(ENDING), "actually {:?}", es ); + assert_is_status_1(&e); }; one(&|_w, r|{ -- 2.30.2