From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 17 Apr 2021 12:44:55 +0000 (+0100)
Subject: packetframe: Fix expect_boom to cope with short reads
X-Git-Tag: otter-0.6.0~560
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c2dd604f143e46310bc20ac9b57e8255e94c6646;p=otter.git

packetframe: Fix expect_boom to cope with short reads

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

diff --git a/src/packetframe.rs b/src/packetframe.rs
index 1912c432..7fcc0016 100644
--- a/src/packetframe.rs
+++ b/src/packetframe.rs
@@ -336,9 +336,12 @@ fn write_test(){
   fn expect_boom<R:Read>(rd: &mut FrameReader<R>) {
     let mut buf = [0u8;10];
     let mut frame = rd.new_frame().unwrap();
-    let y = frame.read(&mut buf).unwrap();
-    dbgc!(&buf[0..y]);
-    let r = frame.read(&mut buf).unwrap_err();
+    let r = loop {
+      match frame.read(&mut buf) {
+        Ok(y) => dbgc!(&buf[0..y]),
+        Err(e) => break e,
+      };
+    };
     dbgc!(&r);
     assert_eq!(r.kind(), ErrorKind::Other);
     assert!(r.into_inner().unwrap().is::<SenderError>());