From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 17 Apr 2021 19:48:56 +0000 (+0100)
Subject: packetframe: tests: Break out expect_is_bad_eof
X-Git-Tag: otter-0.6.0~536
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=578f4e5a5b2bf5158b3f4547a12fcaae7f96b6db;p=otter.git

packetframe: tests: Break out expect_is_bad_eof

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/packetframe.rs b/src/packetframe.rs
index 6b2c9976..e83ffe45 100644
--- a/src/packetframe.rs
+++ b/src/packetframe.rs
@@ -429,11 +429,14 @@ fn write_test(){
     assert!(r.into_inner().unwrap().is::<SenderError>());
     assert_eq!(before, b"boom");
   }
+  fn expect_is_bad_eof(ioe: io::Error) {
+    assert_eq!(ioe.kind(), ErrorKind::UnexpectedEof);
+    ioe.into_inner().map(|i| panic!("unexpected {:?}", &i));
+  }
   fn expect_bad_eof<R:Read>(frame: &mut ReadFrame<R>) {
     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));
+    expect_is_bad_eof(r);
   }
 
   // a very simple test as far as the first boom