Merge remote-tracking branch 'upstream/main'

Author: tkuestner

src/backup.rs

@@ -475,7 +475,11 @@ mod tests {
         assert_eq!(stats.compressed_bytes, 8);
 
         // Will vary depending on compressor and we don't want to be too brittle.
-        assert!(stats.compressed_bytes <= 19, stats.compressed_bytes);
+        assert!(
+            stats.compressed_bytes <= 19,
+            "too many compressed_bytes: {}",
+            stats.compressed_bytes
+        );
 
         // Try to read back
         let (back, sizes) = block_dir.get(&addrs[0]).unwrap();

src/band.rs

@@ -327,6 +327,10 @@ mod tests {
 
         let e = Band::open(&af, &BandId::zero());
         let e_str = e.unwrap_err().to_string();
-        assert!(e_str.contains("Band version \"0.8.8\" in"), e_str);
+        assert!(
+            e_str.contains("Band version \"0.8.8\" in"),
+            "bad band version: {:#?}",
+            e_str
+        );
     }
 }

src/live_tree.rs

@@ -397,7 +397,7 @@ mod tests {
 
         let repr = format!("{:?}", &result[6]);
         let re = Regex::new(r#"LiveEntry \{ apath: Apath\("/jam/apricot"\), kind: File, mtime: UnixTime \{ [^)]* \}, size: Some\(8\), symlink_target: None \}"#).unwrap();
-        assert!(re.is_match(&repr), repr);
+        assert!(re.is_match(&repr));
 
         // TODO: Somehow get the stats out of the iterator.
         // assert_eq!(source_iter.stats.directories_visited, 4);

src/progress.rs

@@ -161,6 +161,8 @@ impl ProgressBar {
             self.percent
         } else if self.total_work > 0 && self.work_done > 0 {
             Some(100f64 * self.work_done as f64 / self.total_work as f64)
+        } else if self.bytes_total > 0 && self.bytes_done > 0 {
+            Some(100f64 * self.bytes_done as f64 / self.bytes_total as f64)
         } else {
             None
         }

tests/delete.rs

@@ -0,0 +1,29 @@
+// Copyright 2015, 2016, 2017, 2019, 2020 Martin Pool.
+
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+//! Test deletion.
+
+use conserve::test_fixtures::ScratchArchive;
+use conserve::*;
+
+#[test]
+fn delete_all_bands() {
+    let af = ScratchArchive::new();
+    af.store_two_versions();
+
+    let stats = af
+        .delete_bands(&[BandId::new(&[0]), BandId::new(&[1])], &Default::default())
+        .expect("delete_bands");
+
+    assert_eq!(stats.deleted_block_count, 2);
+    assert_eq!(stats.deleted_band_count, 2);
+}

tests/integration.rs

@@ -381,16 +381,3 @@ pub fn detect_minimal_mtime_change() {
     assert_eq!(stats.files, 2);
     assert_eq!(stats.unmodified_files, 1);
 }
-
-#[test]
-fn delete_bands() {
-    let af = ScratchArchive::new();
-    af.store_two_versions();
-
-    let stats = af
-        .delete_bands(&[BandId::new(&[0]), BandId::new(&[1])], &Default::default())
-        .expect("delete_bands");
-
-    assert_eq!(stats.deleted_block_count, 2);
-    assert_eq!(stats.deleted_band_count, 2);
-}