packetframe: Tests: Fold first read_all into lumpreader test

With a buffer of len+1 this is equivalent.  This will make it easier
to change the way FrameReader is constructed.

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

diff --git a/src/packetframe.rs b/src/packetframe.rs
index 0d60ad51f74faf54899eba3fb788a7ad301ff1d5..7fd71717025969e748a0503451965854af516c40 100644 (file)
--- a/src/packetframe.rs
+++ b/src/packetframe.rs
@@ -489,12 +489,11 @@ fn write_test(){
     expect_good(&mut rd, b"longer!");
     expect_good_eof(&mut rd);
   };
-  read_all(&mut &*msg.buf);
 
   // try lumpy reads (ie, short reads) at every plausible boundary size
   // this approach is not very principled but ought to test every boundary
   #[cfg(not(miri))]
-  for lumpsize in 1..=msg.buf.len() {
+  for lumpsize in 1..=msg.buf.len()+1 {
     #[derive(Debug)]
     struct LumpReader<R: Read> {
       inner: R,