From 1feb04d7b89e69c898e86eedd4ea24ef5d002f4b Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Fri, 26 Jun 2020 11:20:45 +0200
Subject: [PATCH] tests: cleanup warnings

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
 tests/simple/fs.rs   | 13 +++++++++----
 tests/simple/main.rs |  4 +++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/tests/simple/fs.rs b/tests/simple/fs.rs
index d4ba163..6598eb4 100644
--- a/tests/simple/fs.rs
+++ b/tests/simple/fs.rs
@@ -8,7 +8,7 @@ use pxar::decoder::sync as decoder;
 use pxar::decoder::SeqRead;
 use pxar::encoder::sync as encoder;
 use pxar::encoder::{LinkOffset, SeqWrite};
-use pxar::format::{self, mode, Device};
+use pxar::format::{mode, Device};
 use pxar::EntryKind as PxarEntryKind;
 use pxar::Metadata;
 
@@ -179,8 +179,6 @@ impl Entry {
                 self.no_hardlink()?;
                 let _: () = encoder.add_socket(&self.metadata, &self.name)?;
             }
-
-            other => bail!("TODO: encode_entry for {:?}", other),
         }
         Ok(())
     }
@@ -239,6 +237,14 @@ impl Entry {
                             format_err!("failed to get contents for file entry: {:?}", item.path())
                         })?
                         .read_to_end(&mut data)?;
+                    if data.len() as u64 != *size {
+                        bail!(
+                            "file {:?} was advertised to be of size {} but we read {} bytes",
+                            item.path(),
+                            size,
+                            data.len(),
+                        );
+                    }
                     contents.push(make_entry()?.entry(EntryKind::File(data)));
                 }
                 PxarEntryKind::Directory => {
@@ -270,7 +276,6 @@ impl Entry {
                 PxarEntryKind::Socket => {
                     contents.push(make_entry()?.entry(EntryKind::Socket));
                 }
-                other => todo!("decode for kind {:?}", other),
             }
         }
 
diff --git a/tests/simple/main.rs b/tests/simple/main.rs
index 88e5900..337c7fa 100644
--- a/tests/simple/main.rs
+++ b/tests/simple/main.rs
@@ -33,7 +33,9 @@ fn test1() {
     let mut encoder =
         encoder::Encoder::from_std(&mut file, &test_fs.metadata).expect("failed to create encoder");
     encode_directory(&mut encoder, &test_fs).expect("failed to encode test file system");
-    encoder.finish();
+    encoder
+        .finish()
+        .expect("failed to finish encoding the pxar archive");
 
     assert!(!file.is_empty(), "encoder did not write any data");
 
-- 
2.39.2