Test the editable owners

The change is trivial, but getting it tested was a bit more work 😅

Author: iustin

src/lib.rs

@@ -100,7 +100,11 @@ impl EncodeLabelValue for ErrorType {
 
 pub fn check_ownership(config: &Config, path: &Path, m: &Metadata, k: &FileKind) -> bool {
     let mut good = true;
-    if let Some(owner) = config.raw_owner {
+    if *k == FileKind::Editable {
+        if !config.editable_owners.is_empty() {
+            good &= config.editable_owners.contains(&m.uid());
+        }
+    } else if let Some(owner) = config.raw_owner {
         good &= owner == m.uid();
     }
     if let Some(group) = config.group {
@@ -564,6 +568,39 @@ mod tests {
         check_has_dir_with(&backlog, ROOT_FILE_DIR, 1);
     }
 
+    #[rstest]
+    fn test_ownership_editable(
+        mut test_data: TestData,
+        mut backlog: Backlog,
+        #[values(true, false)] do_fail: bool,
+        #[values(0, 1, 2, 5)] extra_allowed: u32,
+    ) {
+        let _ = env_logger::builder().is_test(true).try_init();
+
+        let fname = add_file(test_data.temp_dir.path(), "file.jpg");
+        let m = std::fs::metadata(fname).expect("Can't stat just created file!");
+        fn generate_check(add_own: bool, id: u32, extras: u32) -> Vec<u32> {
+            let mut v = vec![];
+            if add_own {
+                v.push(id);
+            } else {
+                v.push(id + 1);
+            }
+            for e in 0..extras {
+                v.push(id + e + 2);
+            }
+            v
+        }
+        test_data
+            .editable_owners
+            .extend(generate_check(!do_fail, m.uid(), extra_allowed));
+        let config = test_data.build_config(None, None, None, None, None);
+        backlog.scan(&config, test_data.now);
+        let expected_errors = if do_fail { 1 } else { 0 };
+        check_backlog(&backlog, 1, 1, 0, expected_errors, 0, 0);
+        check_has_dir_with(&backlog, ROOT_FILE_DIR, 1);
+    }
+
     #[rstest]
     fn test_permissions(
         test_data: TestData,

tests/cli-tests.rs

@@ -49,6 +49,7 @@ fn test_permissions_check() {
     let mut cmd = Command::cargo_bin("oneshot").unwrap();
     cmd.args(["--path", temp_dir.path().to_str().unwrap()])
         .args(["--raw-owner", &format!("{}", m.uid() + 1)])
+        .args(["--editable-owners", &format!("{}", m.uid() + 1)])
         .args(["--raw-file-mode", "644"]);
 
     cmd.assert()

tests/log-tests.rs

@@ -26,7 +26,7 @@ fn test_ownership_logs() {
     let m = std::fs::metadata(&fname).expect("Can't stat just created file!");
     let _ = create_file(temp_dir.path(), "file2.jpg", 0o644);
     let _ = create_file(temp_dir.path(), "file3.jpg", 0o664);
-    let editable_owners = vec![];
+    let editable_owners = vec![m.uid() + 1];
     let config = Config {
         root_path: temp_dir.path(),
         ignored_exts: &[],