From 19a16c653d6b4d5bc61b5d05e5e51cc64e606f09 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 17 Apr 2021 19:53:05 +0100 Subject: [PATCH] packetframe: tests: Break out expect_bad_eof Signed-off-by: Ian Jackson --- src/packetframe.rs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/packetframe.rs b/src/packetframe.rs index d3ec7ad0..84db3392 100644 --- a/src/packetframe.rs +++ b/src/packetframe.rs @@ -406,6 +406,12 @@ fn write_test(){ assert!(r.into_inner().unwrap().is::()); assert_eq!(before, b"boom"); } + fn expect_bad_eof(frame: &mut ReadFrame) { + let mut buf = [0u8;10]; + let r = frame.read(&mut buf).unwrap_err(); + assert_eq!(r.kind(), ErrorKind::UnexpectedEof); + r.into_inner().map(|i| panic!("unexpected {:?}", &i)); + } // a very simple test as far as the first boom let mut rd = FrameReader::new(&*msg.buf); @@ -482,9 +488,7 @@ fn write_test(){ { let mut rd = FrameReader::new(&[0x55][..]); let mut frame = rd.new_frame().unwrap(); - let r = frame.read(&mut buf).unwrap_err(); - assert_eq!(r.kind(), ErrorKind::UnexpectedEof); - r.into_inner().map(|i| panic!("unexpected {:?}", &i)); + expect_bad_eof(&mut frame); } // Unexpected EOF mid-data @@ -493,9 +497,7 @@ fn write_test(){ let mut frame = rd.new_frame().unwrap(); let y = frame.read(&mut buf).unwrap(); assert_eq!(y, 1); - let r = frame.read(&mut buf).unwrap_err(); - assert_eq!(r.kind(), ErrorKind::UnexpectedEof); - r.into_inner().map(|i| panic!("unexpected {:?}", &i)); + expect_bad_eof(&mut frame); } // Unexpected EOF after nonempty chunk @@ -504,8 +506,6 @@ fn write_test(){ let mut frame = rd.new_frame().unwrap(); let y = frame.read(&mut buf).unwrap(); assert_eq!(&buf[0..y], b"hello"); - let r = frame.read(&mut buf).unwrap_err(); - assert_eq!(r.kind(), ErrorKind::UnexpectedEof); - r.into_inner().map(|i| panic!("unexpected {:?}", &i)); + expect_bad_eof(&mut frame); } } -- 2.30.2