RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 03:27:44 +00:00
Code Issues Activity

shred, stat, tail: Remove direct usage of CmdResult fields in test

Browse source
This commit is contained in:
Gilad Naaman 2021-04-17 15:22:20 +03:00
parent 7c7e64e79c
commit 600bab52ff
3 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/by-util/test_shred.rs
View file

@ -36,9 +36,7 @@ fn test_shred_force() {
at.set_readonly(file); at.set_readonly(file);
// Try shred -u. // Try shred -u.
let result = scene.ucmd().arg("-u").arg(file).run(); scene.ucmd().arg("-u").arg(file).run();
println!("stderr = {:?}", result.stderr);
println!("stdout = {:?}", result.stdout);
// file_a was not deleted because it is readonly. // file_a was not deleted because it is readonly.
assert!(at.file_exists(file)); assert!(at.file_exists(file));

6
tests/by-util/test_stat.rs
View file

@ -194,7 +194,7 @@ fn test_terse_normal_format() {
// note: contains birth/creation date which increases test fragility // note: contains birth/creation date which increases test fragility
// * results may vary due to built-in `stat` limitations as well as linux kernel and rust version capability variations // * results may vary due to built-in `stat` limitations as well as linux kernel and rust version capability variations
let args = ["-t", "/"]; let args = ["-t", "/"];
let actual = new_ucmd!().args(&args).run().stdout; let actual = new_ucmd!().args(&args).succeeds().stdout_move_str();
let expect = expected_result(&args); let expect = expected_result(&args);
println!("actual: {:?}", actual); println!("actual: {:?}", actual);
println!("expect: {:?}", expect); println!("expect: {:?}", expect);
@ -216,7 +216,7 @@ fn test_terse_normal_format() {
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
fn test_format_created_time() { fn test_format_created_time() {
let args = ["-c", "%w", "/boot"]; let args = ["-c", "%w", "/boot"];
let actual = new_ucmd!().args(&args).run().stdout; let actual = new_ucmd!().args(&args).succeeds().stdout_move_str();
let expect = expected_result(&args); let expect = expected_result(&args);
println!("actual: {:?}", actual); println!("actual: {:?}", actual);
println!("expect: {:?}", expect); println!("expect: {:?}", expect);
@ -240,7 +240,7 @@ fn test_format_created_time() {
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
fn test_format_created_seconds() { fn test_format_created_seconds() {
let args = ["-c", "%W", "/boot"]; let args = ["-c", "%W", "/boot"];
let actual = new_ucmd!().args(&args).run().stdout; let actual = new_ucmd!().args(&args).succeeds().stdout_move_str();
let expect = expected_result(&args); let expect = expected_result(&args);
println!("actual: {:?}", actual); println!("actual: {:?}", actual);
println!("expect: {:?}", expect); println!("expect: {:?}", expect);

8
tests/by-util/test_tail.rs
View file

@ -226,8 +226,8 @@ fn test_bytes_big() {
.arg(FILE) .arg(FILE)
.arg("-c") .arg("-c")
.arg(format!("{}", N_ARG)) .arg(format!("{}", N_ARG))
.run() .succeeds()
.stdout; .stdout_move_str();
let expected = at.read(EXPECTED_FILE); let expected = at.read(EXPECTED_FILE);
assert_eq!(result.len(), expected.len()); assert_eq!(result.len(), expected.len());
@ -340,6 +340,6 @@ fn test_negative_indexing() {
let negative_bytes_index = new_ucmd!().arg("-c").arg("-20").arg(FOOBAR_TXT).run(); let negative_bytes_index = new_ucmd!().arg("-c").arg("-20").arg(FOOBAR_TXT).run();
assert_eq!(positive_lines_index.stdout, negative_lines_index.stdout); assert_eq!(positive_lines_index.stdout(), negative_lines_index.stdout());
assert_eq!(positive_bytes_index.stdout, negative_bytes_index.stdout); assert_eq!(positive_bytes_index.stdout(), negative_bytes_index.stdout());
} }