tests/prune.rs: add more tests

diff --git a/tests/prune.rs b/tests/prune.rs
index 9430746f7c15d5464504fc614bfb852d5bb34984..81cd03123d3f336243b1407db7fb6e8592105677 100644 (file)
--- a/tests/prune.rs
+++ b/tests/prune.rs
@@ -5,6 +5,7 @@ use proxmox_backup::backup::*;
 
 fn get_prune_list(
     list: Vec<BackupInfo>,
+    return_kept: bool,
     keep_last: Option<u64>,
     keep_daily: Option<u64>,
     keep_weekly: Option<u64>,
@@ -16,11 +17,11 @@ fn get_prune_list(
         list, keep_last, keep_daily, keep_weekly, keep_monthly, keep_yearly).unwrap();
 
     prune_info.reverse();
-    
+
     prune_info
         .iter()
         .filter_map(|(info, keep)| {
-            if *keep {
+            if *keep != return_kept {
                 None
             } else {
                 Some(info.backup_dir.relative_path())
@@ -41,9 +42,66 @@ fn create_info(
     if !partial {
         files.push(String::from(MANIFEST_BLOB_NAME));
     }
-    
+
     BackupInfo { backup_dir, files }
 }
+#[test]
+fn test_prune_simple2() -> Result<(), Error> {
+
+    let mut orig_list = Vec::new();
+
+    orig_list.push(create_info("host/elsa/2018-11-15T11:59:15Z", false));
+    orig_list.push(create_info("host/elsa/2019-11-15T11:59:15Z", false));
+    orig_list.push(create_info("host/elsa/2019-11-21T11:59:15Z", false));
+    orig_list.push(create_info("host/elsa/2019-11-22T11:59:15Z", false));
+    orig_list.push(create_info("host/elsa/2019-11-29T11:59:15Z", false));
+    orig_list.push(create_info("host/elsa/2019-12-01T11:59:15Z", false));
+    orig_list.push(create_info("host/elsa/2019-12-02T11:59:15Z", false));
+    orig_list.push(create_info("host/elsa/2019-12-03T11:59:15Z", false));
+    orig_list.push(create_info("host/elsa/2019-12-04T11:59:15Z", false));
+
+    let list = orig_list.clone();
+    let remove_list = get_prune_list(list, true, Some(1), None, None, None, None);
+    let expect: Vec<PathBuf> = vec![
+        PathBuf::from("host/elsa/2019-12-04T11:59:15Z"),
+    ];
+    assert_eq!(remove_list, expect);
+
+    let list = orig_list.clone();
+    let remove_list = get_prune_list(list, true, Some(1), Some(1), None, None, None);
+    let expect: Vec<PathBuf> = vec![
+        PathBuf::from("host/elsa/2019-12-03T11:59:15Z"),
+        PathBuf::from("host/elsa/2019-12-04T11:59:15Z"),
+    ];
+    assert_eq!(remove_list, expect);
+
+    let list = orig_list.clone();
+    let remove_list = get_prune_list(list, true, None, Some(1), Some(1), None, None);
+    let expect: Vec<PathBuf> = vec![
+        PathBuf::from("host/elsa/2019-12-01T11:59:15Z"),
+        PathBuf::from("host/elsa/2019-12-04T11:59:15Z"),
+    ];
+    assert_eq!(remove_list, expect);
+
+    let list = orig_list.clone();
+    let remove_list = get_prune_list(list, true, None, Some(1), Some(1), Some(1), None);
+    let expect: Vec<PathBuf> = vec![
+        PathBuf::from("host/elsa/2019-11-22T11:59:15Z"),
+        PathBuf::from("host/elsa/2019-12-01T11:59:15Z"),
+        PathBuf::from("host/elsa/2019-12-04T11:59:15Z"),
+    ];
+    assert_eq!(remove_list, expect);
+
+    let list = orig_list.clone();
+    let remove_list = get_prune_list(list, true, None, None, None, Some(1), Some(1));
+    let expect: Vec<PathBuf> = vec![
+        PathBuf::from("host/elsa/2018-11-15T11:59:15Z"),
+        PathBuf::from("host/elsa/2019-12-04T11:59:15Z"),
+    ];
+    assert_eq!(remove_list, expect);
+
+    Ok(())
+}
 
 #[test]
 fn test_prune_simple() -> Result<(), Error> {
@@ -55,23 +113,22 @@ fn test_prune_simple() -> Result<(), Error> {
     orig_list.push(create_info("host/elsa/2019-12-04T11:59:15Z", false));
     orig_list.push(create_info("host/elsa/2019-12-04T12:59:15Z", false));
 
-    
     // keep-last tests
 
     let list = orig_list.clone();
-    let remove_list = get_prune_list(list, Some(4), None, None, None, None);
+    let remove_list = get_prune_list(list, false, Some(4), None, None, None, None);
     let expect: Vec<PathBuf> = Vec::new();
     assert_eq!(remove_list, expect);
 
     let list = orig_list.clone();
-    let remove_list = get_prune_list(list, Some(3), None, None, None, None);
+    let remove_list = get_prune_list(list, false, Some(3), None, None, None, None);
     let expect: Vec<PathBuf> = vec![
         PathBuf::from("host/elsa/2019-12-02T11:59:15Z"),
     ];
     assert_eq!(remove_list, expect);
 
     let list = orig_list.clone();
-    let remove_list = get_prune_list(list, Some(2), None, None, None, None);
+    let remove_list = get_prune_list(list, false, Some(2), None, None, None, None);
     let expect: Vec<PathBuf> = vec![
         PathBuf::from("host/elsa/2019-12-02T11:59:15Z"),
         PathBuf::from("host/elsa/2019-12-03T11:59:15Z"),
@@ -79,7 +136,7 @@ fn test_prune_simple() -> Result<(), Error> {
     assert_eq!(remove_list, expect);
 
     let list = orig_list.clone();
-    let remove_list = get_prune_list(list, Some(1), None, None, None, None);
+    let remove_list = get_prune_list(list, false, Some(1), None, None, None, None);
     let expect: Vec<PathBuf> = vec![
         PathBuf::from("host/elsa/2019-12-02T11:59:15Z"),
         PathBuf::from("host/elsa/2019-12-03T11:59:15Z"),
@@ -88,7 +145,7 @@ fn test_prune_simple() -> Result<(), Error> {
     assert_eq!(remove_list, expect);
 
     let list = orig_list.clone();
-    let remove_list = get_prune_list(list, Some(0), None, None, None, None);
+    let remove_list = get_prune_list(list, false, Some(0), None, None, None, None);
     let expect: Vec<PathBuf> = vec![
         PathBuf::from("host/elsa/2019-12-02T11:59:15Z"),
         PathBuf::from("host/elsa/2019-12-03T11:59:15Z"),
@@ -99,19 +156,19 @@ fn test_prune_simple() -> Result<(), Error> {
 
     // keep-last, keep-daily mixed
     let list = orig_list.clone();
-    let remove_list = get_prune_list(list, Some(2), Some(2), None, None, None);
+    let remove_list = get_prune_list(list, false, Some(2), Some(2), None, None, None);
     let expect: Vec<PathBuf> = vec![];
     assert_eq!(remove_list, expect);
 
     // keep-daily test
     let list = orig_list.clone();
-    let remove_list = get_prune_list(list, None, Some(3), None, None, None);
+    let remove_list = get_prune_list(list, false, None, Some(3), None, None, None);
     let expect: Vec<PathBuf> = vec![PathBuf::from("host/elsa/2019-12-04T11:59:15Z")];
     assert_eq!(remove_list, expect);
 
     // keep-daily test
     let list = orig_list.clone();
-    let remove_list = get_prune_list(list, None, Some(2), None, None, None);
+    let remove_list = get_prune_list(list, false, None, Some(2), None, None, None);
     let expect: Vec<PathBuf> = vec![
         PathBuf::from("host/elsa/2019-12-02T11:59:15Z"),
         PathBuf::from("host/elsa/2019-12-04T11:59:15Z"),
@@ -120,7 +177,7 @@ fn test_prune_simple() -> Result<(), Error> {
 
     // keep-weekly
     let list = orig_list.clone();
-    let remove_list = get_prune_list(list, None, None, Some(5), None, None);
+    let remove_list = get_prune_list(list, false, None, None, Some(5), None, None);
     // all backup are within the same week, so we only keep a single file
     let expect: Vec<PathBuf> = vec![
         PathBuf::from("host/elsa/2019-12-02T11:59:15Z"),
@@ -131,7 +188,7 @@ fn test_prune_simple() -> Result<(), Error> {
 
     // keep-daily + keep-weekly
     let list = orig_list.clone();
-    let remove_list = get_prune_list(list, None, Some(1), Some(5), None, None);
+    let remove_list = get_prune_list(list, false, None, Some(1), Some(5), None, None);
     let expect: Vec<PathBuf> = vec![
         PathBuf::from("host/elsa/2019-12-02T11:59:15Z"),
         PathBuf::from("host/elsa/2019-12-03T11:59:15Z"),
@@ -141,7 +198,7 @@ fn test_prune_simple() -> Result<(), Error> {
 
     // keep-monthly
     let list = orig_list.clone();
-    let remove_list = get_prune_list(list, None, None, None, Some(6), None);
+    let remove_list = get_prune_list(list, false, None, None, None, Some(6), None);
     // all backup are within the same month, so we only keep a single file
     let expect: Vec<PathBuf> = vec![
         PathBuf::from("host/elsa/2019-12-02T11:59:15Z"),
@@ -152,7 +209,7 @@ fn test_prune_simple() -> Result<(), Error> {
 
     // keep-yearly
     let list = orig_list.clone();
-    let remove_list = get_prune_list(list, None, None, None, None, Some(7));
+    let remove_list = get_prune_list(list, false, None, None, None, None, Some(7));
     // all backup are within the same year, so we only keep a single file
     let expect: Vec<PathBuf> = vec![
         PathBuf::from("host/elsa/2019-12-02T11:59:15Z"),
@@ -163,7 +220,7 @@ fn test_prune_simple() -> Result<(), Error> {
 
     // keep-weekly + keep-monthly + keep-yearly
     let list = orig_list.clone();
-    let remove_list = get_prune_list(list, None, None, Some(5), Some(6), Some(7));
+    let remove_list = get_prune_list(list, false, None, None, Some(5), Some(6), Some(7));
     // all backup are within one week, so we only keep a single file
     let expect: Vec<PathBuf> = vec![
         PathBuf::from("host/elsa/2019-12-02T11:59:15Z"),