From 9b61a37036d7fbf2fda4cd39b9937750e0785eae Mon Sep 17 00:00:00 2001 From: "Andrew Phillips (aider)" Date: Wed, 14 May 2025 09:45:04 -0300 Subject: [PATCH] refactor: Rename env variable to keep_cmd in tests --- src/tests.rs | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/tests.rs b/src/tests.rs index 4402405..a9d44fc 100644 --- a/src/tests.rs +++ b/src/tests.rs @@ -195,9 +195,9 @@ mod tests { // Create test items with the common environment setup create_test_items(data_dir); - let env = format!("KEEP_DIR={} cargo run -- --verbose", data_dir.display()); + let keep_cmd = format!("KEEP_DIR={} cargo run -- --verbose", data_dir.display()); - let cmd = format!("{} --list", env); + let cmd = format!("{} --list", keep_cmd); let output = run_sh(cmd.as_str()); assert!( output.status.success(), @@ -206,7 +206,7 @@ mod tests { output.status ); - let cmd = format!("{} -l", env); + let cmd = format!("{} -l", keep_cmd); let output = run_sh(cmd.as_str()); assert!( output.status.success(), @@ -215,7 +215,7 @@ mod tests { output.status ); - let cmd = format!("{} --list tag_a", env); + let cmd = format!("{} --list tag_a", keep_cmd); let output = run_sh(cmd.as_str()); assert!( output.status.success(), @@ -233,9 +233,9 @@ mod tests { // Create test items with the common environment setup create_test_items(data_dir); - let env = format!("KEEP_DIR={} cargo run -- --verbose", data_dir.display()); + let keep_cmd = format!("KEEP_DIR={} cargo run -- --verbose", data_dir.display()); - let cmd = format!("{} --delete tag", env); + let cmd = format!("{} --delete tag", keep_cmd); let output = run_sh(cmd.as_str()); assert!( !output.status.success(), @@ -244,7 +244,7 @@ mod tests { output.status ); - let cmd = format!("{} --delete 1", env); + let cmd = format!("{} --delete 1", keep_cmd); let output = run_sh(cmd.as_str()); assert!( output.status.success(), @@ -253,7 +253,7 @@ mod tests { output.status ); - let cmd = format!("{} -d 2", env); + let cmd = format!("{} -d 2", keep_cmd); let output = run_sh(cmd.as_str()); assert!( output.status.success(), @@ -262,7 +262,7 @@ mod tests { output.status ); - let cmd = format!("{} --delete 9999", env); + let cmd = format!("{} --delete 9999", keep_cmd); let output = run_sh(cmd.as_str()); assert!( output.status.success(), @@ -281,9 +281,9 @@ mod tests { // Create test items with the common environment setup create_test_items(data_dir); - let env = format!("KEEP_DIR={} cargo run -- --verbose", data_dir.display()); + let keep_cmd = format!("KEEP_DIR={} cargo run -- --verbose", data_dir.display()); - let cmd = format!("{} --diff 1 2", env); + let cmd = format!("{} --diff 1 2", keep_cmd); let output = run_sh(cmd.as_str()); assert!( output.status.success(), @@ -296,7 +296,7 @@ mod tests { let output_str = String::from_utf8_lossy(&output.stdout).to_string(); assert!(output_str.contains(INPUT_B), "Command output does not contain expected string. Command: {} Output: {} Expected: \"{}\"", cmd, output_str, INPUT_B); - let cmd = format!("{} --diff tag_a tag_b", env); + let cmd = format!("{} --diff tag_a tag_b", keep_cmd); let output = run_sh(cmd.as_str()); assert!( !output.status.success(), @@ -305,7 +305,7 @@ mod tests { output.status ); - let cmd = format!("{} --diff tag_a 2", env); + let cmd = format!("{} --diff tag_a 2", keep_cmd); let output = run_sh(cmd.as_str()); assert!( !output.status.success(), @@ -314,7 +314,7 @@ mod tests { output.status ); - let cmd = format!("{} --diff 9999 2", env); + let cmd = format!("{} --diff 9999 2", keep_cmd); let output = run_sh(cmd.as_str()); assert!( !output.status.success(), @@ -339,10 +339,10 @@ mod tests { fn test_compression() { with_temp_env(|data_dir| { // Set the data directory for this test - let env = format!("KEEP_DIR={} cargo run -- --verbose", data_dir.display()); + let keep_cmd = format!("KEEP_DIR={} cargo run -- --verbose", data_dir.display()); // Test with no compression - let cmd = format!("echo {} | {} -c unknown unknown", INPUT_A, env); + let cmd = format!("echo {} | {} -c unknown unknown", INPUT_A, keep_cmd); println!("RUNNING: {}", cmd); let output = run_sh(cmd.as_str()); assert!( @@ -353,7 +353,7 @@ mod tests { ); // Test with no compression - let cmd = format!("echo {} | {} -c none none", INPUT_A, env); + let cmd = format!("echo {} | {} -c none none", INPUT_A, keep_cmd); println!("RUNNING: {}", cmd); let output = run_sh(cmd.as_str()); assert!( @@ -363,7 +363,7 @@ mod tests { output.status ); - let cmd = format!("{} --get none", env); + let cmd = format!("{} --get none", keep_cmd); println!("RUNNING: {}", cmd); let output = run_sh(cmd.as_str()); assert!( @@ -376,7 +376,7 @@ mod tests { assert!(output_str.contains(INPUT_A), "Command output does not contain expected string. Command: {} Output: {} Expected: \"{}\"", cmd, output_str, INPUT_A); // Test with lz4 compression - let cmd = format!("echo {} | {} -c lz4 lz4", INPUT_A, env); + let cmd = format!("echo {} | {} -c lz4 lz4", INPUT_A, keep_cmd); println!("RUNNING: {}", cmd); let output = run_sh(cmd.as_str()); assert!( @@ -386,7 +386,7 @@ mod tests { output.status ); - let cmd = format!("{} --get lz4", env); + let cmd = format!("{} --get lz4", keep_cmd); println!("RUNNING: {}", cmd); let output = run_sh(cmd.as_str()); assert!( @@ -399,7 +399,7 @@ mod tests { assert!(output_str.contains(INPUT_A), "Command output does not contain expected string. Command: {} Output: {} Expected: \"{}\"", cmd, output_str, INPUT_A); // Test with gzip compression - let cmd = format!("echo {} | {} -c gzip gzip", INPUT_A, env); + let cmd = format!("echo {} | {} -c gzip gzip", INPUT_A, keep_cmd); println!("RUNNING: {}", cmd); let output = run_sh(cmd.as_str()); assert!( @@ -409,7 +409,7 @@ mod tests { output.status ); - let cmd = format!("{} --get gzip", env); + let cmd = format!("{} --get gzip", keep_cmd); println!("RUNNING: {}", cmd); let output = run_sh(cmd.as_str()); assert!( @@ -422,7 +422,7 @@ mod tests { assert!(output_str.contains(INPUT_A), "Command output does not contain expected string. Command: {} Output: {} Expected: \"{}\"", cmd, output_str, INPUT_A); // Test with bzip2 compression - let cmd = format!("echo {} | {} -c bzip2 bzip2", INPUT_A, env); + let cmd = format!("echo {} | {} -c bzip2 bzip2", INPUT_A, keep_cmd); println!("RUNNING: {}", cmd); let output = run_sh(cmd.as_str()); assert!( @@ -432,7 +432,7 @@ mod tests { output.status ); - let cmd = format!("{} --get bzip2", env); + let cmd = format!("{} --get bzip2", keep_cmd); println!("RUNNING: {}", cmd); let output = run_sh(cmd.as_str()); assert!(