From bc56ecca6e77432e292d02148d86876e13ddf034 Mon Sep 17 00:00:00 2001 From: _cry64 Date: Fri, 10 Apr 2026 10:14:46 +1000 Subject: [PATCH] update flake tests --- nixide/src/flake/locked_flake.rs | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/nixide/src/flake/locked_flake.rs b/nixide/src/flake/locked_flake.rs index 3a76880..7a71fa6 100644 --- a/nixide/src/flake/locked_flake.rs +++ b/nixide/src/flake/locked_flake.rs @@ -166,7 +166,10 @@ mod tests { assert_eq!(flakeref.fragment(), "subthing"); - let outputs = LockedFlake::lock(, flakeref, &eval_state).unwrap().outputs().unwrap(); + let outputs = LockedFlake::lock(FlakeLockMode::WriteAsNeeded, flakeref, &eval_state) + .unwrap() + .outputs() + .unwrap(); assert!(matches!(outputs, Value::Attrs(_))); if let Value::Attrs(outputs) = outputs { @@ -262,9 +265,9 @@ mod tests { assert_eq!(flakeref_a.fragment(), ""); // Step 1: Do not update (check), fails - flake_lock_flags.set_mode(&FlakeLockMode::Check).unwrap(); + flake_lock_flags.set_mode(FlakeLockMode::Check).unwrap(); - let locked_flake = LockedFlake::lock(flake_lock_flags, flakeref_a, &eval_state); + let locked_flake = LockedFlake::lock(FlakeLockMode::Check, flakeref_a, &eval_state); // Has not been locked and would need to write a lock file. assert!(locked_flake.is_err()); let saved_err = match locked_flake { @@ -273,7 +276,7 @@ mod tests { }; // Step 2: Update but do not write, succeeds - flake_lock_flags.set_mode(&FlakeLockMode::Virtual).unwrap(); + flake_lock_flags.set_mode(FlakeLockMode::Virtual).unwrap(); let locked_flake = LockedFlake::lock(flake_lock_flags, flakeref_a, &eval_state).unwrap(); @@ -290,7 +293,7 @@ mod tests { } // Step 3: The lock was not written, so Step 1 would fail again - flake_lock_flags.set_mode(&FlakeLockMode::Check).unwrap(); + flake_lock_flags.set_mode(FlakeLockMode::Check).unwrap(); let locked_flake = LockedFlake::lock(flake_lock_flags, flakeref_a, &eval_state); // Has not been locked and would need to write a lock file. @@ -303,7 +306,7 @@ mod tests { // Step 4: Update and write, succeeds flake_lock_flags - .set_mode(&FlakeLockMode::WriteAsNeeded) + .set_mode(FlakeLockMode::WriteAsNeeded) .unwrap(); let locked_flake = LockedFlake::lock(flake_lock_flags, flakeref_a, &eval_state).unwrap(); @@ -321,7 +324,7 @@ mod tests { } // Step 5: Lock was written, so Step 1 succeeds - flake_lock_flags.set_mode(&FlakeLockMode::Check).unwrap(); + flake_lock_flags.set_mode(FlakeLockMode::Check).unwrap(); let locked_flake = LockedFlake::lock(flake_lock_flags, flakeref_a, &eval_state).unwrap(); @@ -341,7 +344,7 @@ mod tests { // This shouldn't matter; write_as_needed will be overridden flake_lock_flags - .set_mode(&FlakeLockMode::WriteAsNeeded) + .set_mode(FlakeLockMode::WriteAsNeeded) .unwrap(); let flakeref_c = FlakeRef::parse(&format!("path:{}", &flake_dir_c_str)).unwrap(); @@ -367,7 +370,7 @@ mod tests { let mut flake_lock_flags = FlakeLockFlags::new(&flake_settings).unwrap(); // Step 7: Override was not written; lock still points to b - flake_lock_flags.set_mode(&FlakeLockMode::Check).unwrap(); + flake_lock_flags.set_mode(FlakeLockMode::Check).unwrap(); let locked_flake = LockedFlake::lock(flake_lock_flags, flakeref_a, &eval_state).unwrap();