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

pinky, mktemp: Remove direct usage of CmdResult fields in test

Browse source
This commit is contained in:
Gilad Naaman 2021-04-17 15:14:49 +03:00
parent 0d1946a5d2
commit 7c7e64e79c
2 changed files with 13 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

24
tests/by-util/test_mktemp.rs
View file

@ -113,17 +113,14 @@ fn test_mktemp_mktemp_t() {
.arg("-t") .arg("-t")
.arg(TEST_TEMPLATE7) .arg(TEST_TEMPLATE7)
.succeeds(); .succeeds();
let result = scene scene
.ucmd() .ucmd()
.env(TMPDIR, &pathname) .env(TMPDIR, &pathname)
.arg("-t") .arg("-t")
.arg(TEST_TEMPLATE8) .arg(TEST_TEMPLATE8)
.fails(); .fails()
println!("stdout {}", result.stdout); .no_stdout()
println!("stderr {}", result.stderr); .stderr_contains("error: suffix cannot contain any path separators");
assert!(result
.stderr
.contains("error: suffix cannot contain any path separators"));
} }
#[test] #[test]
@ -391,10 +388,9 @@ fn test_mktemp_tmpdir_one_arg() {
.arg("--tmpdir") .arg("--tmpdir")
.arg("apt-key-gpghome.XXXXXXXXXX") .arg("apt-key-gpghome.XXXXXXXXXX")
.succeeds(); .succeeds();
println!("stdout {}", result.stdout); result.no_stderr()
println!("stderr {}", result.stderr); .stdout_contains("apt-key-gpghome.");
assert!(result.stdout.contains("apt-key-gpghome.")); assert!(PathBuf::from(result.stdout_str().trim()).is_file());
assert!(PathBuf::from(result.stdout.trim()).is_file());
} }
#[test] #[test]
@ -407,8 +403,6 @@ fn test_mktemp_directory_tmpdir() {
.arg("--tmpdir") .arg("--tmpdir")
.arg("apt-key-gpghome.XXXXXXXXXX") .arg("apt-key-gpghome.XXXXXXXXXX")
.succeeds(); .succeeds();
println!("stdout {}", result.stdout); result.no_stderr().stdout_contains("apt-key-gpghome.");
println!("stderr {}", result.stderr); assert!(PathBuf::from(result.stdout_str().trim()).is_dir());
assert!(result.stdout.contains("apt-key-gpghome."));
assert!(PathBuf::from(result.stdout.trim()).is_dir());
} }

12
tests/by-util/test_pinky.rs
View file

@ -43,11 +43,9 @@ fn test_short_format_i() {
let actual = TestScenario::new(util_name!()) let actual = TestScenario::new(util_name!())
.ucmd() .ucmd()
.args(&args) .args(&args)
.run() .succeeds()
.stdout; .stdout_move_str();
let expect = expected_result(&args); let expect = expected_result(&args);
println!("actual: {:?}", actual);
println!("expect: {:?}", expect);
let v_actual: Vec<&str> = actual.split_whitespace().collect(); let v_actual: Vec<&str> = actual.split_whitespace().collect();
let v_expect: Vec<&str> = expect.split_whitespace().collect(); let v_expect: Vec<&str> = expect.split_whitespace().collect();
assert_eq!(v_actual, v_expect); assert_eq!(v_actual, v_expect);
@ -62,11 +60,9 @@ fn test_short_format_q() {
let actual = TestScenario::new(util_name!()) let actual = TestScenario::new(util_name!())
.ucmd() .ucmd()
.args(&args) .args(&args)
.run() .succeeds()
.stdout; .stdout_move_str();
let expect = expected_result(&args); let expect = expected_result(&args);
println!("actual: {:?}", actual);
println!("expect: {:?}", expect);
let v_actual: Vec<&str> = actual.split_whitespace().collect(); let v_actual: Vec<&str> = actual.split_whitespace().collect();
let v_expect: Vec<&str> = expect.split_whitespace().collect(); let v_expect: Vec<&str> = expect.split_whitespace().collect();
assert_eq!(v_actual, v_expect); assert_eq!(v_actual, v_expect);