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

Fix the windows tests

Browse source
This commit is contained in:
Sylvestre Ledru 2023-12-24 15:18:31 +01:00
parent ceecac110c
commit 15573579cc
3 changed files with 39 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

15
tests/by-util/test_cp.rs
View file

@ -3571,12 +3571,15 @@ fn test_cp_seen_file() {
at.write("a/f", "a");
at.write("b/f", "b");
ts.ucmd()
.arg("a/f")
.arg("b/f")
.arg("c")
.fails()
.stderr_contains("will not overwrite just-created 'c/f' with 'b/f'");
let result = ts.ucmd().arg("a/f").arg("b/f").arg("c").fails();
#[cfg(not(unix))]
assert!(result
.stderr_str()
.contains("will not overwrite just-created 'c\\f' with 'b/f'"));
#[cfg(unix)]
assert!(result
.stderr_str()
.contains("will not overwrite just-created 'c/f' with 'b/f'"));
assert!(at.plus("c").join("f").exists());

16
tests/by-util/test_ln.rs
View file

@ -733,12 +733,16 @@ fn test_ln_seen_file() {
at.write("a/f", "a");
at.write("b/f", "b");
ts.ucmd()
.arg("a/f")
.arg("b/f")
.arg("c")
.fails()
.stderr_contains("will not overwrite just-created 'c/f' with 'b/f'");
let result = ts.ucmd().arg("a/f").arg("b/f").arg("c").fails();
#[cfg(not(unix))]
assert!(result
.stderr_str()
.contains("will not overwrite just-created 'c\\f' with 'b/f'"));
#[cfg(unix)]
assert!(result
.stderr_str()
.contains("will not overwrite just-created 'c/f' with 'b/f'"));
assert!(at.plus("c").join("f").exists());
// b/f still exists

33
tests/by-util/test_mv.rs
View file

@ -1480,12 +1480,16 @@ fn test_mv_seen_file() {
at.write("a/f", "a");
at.write("b/f", "b");
ts.ucmd()
.arg("a/f")
.arg("b/f")
.arg("c")
.fails()
.stderr_contains("will not overwrite just-created 'c/f' with 'b/f'");
let result = ts.ucmd().arg("a/f").arg("b/f").arg("c").fails();
#[cfg(not(unix))]
assert!(result
.stderr_str()
.contains("will not overwrite just-created 'c\\f' with 'b/f'"));
#[cfg(unix)]
assert!(result
.stderr_str()
.contains("will not overwrite just-created 'c/f' with 'b/f'"));
// a/f has been moved into c/f
assert!(at.plus("c").join("f").exists());
@ -1507,13 +1511,16 @@ fn test_mv_seen_multiple_files_to_directory() {
at.write("b/f", "b");
at.write("b/g", "g");
ts.ucmd()
.arg("a/f")
.arg("b/f")
.arg("b/g")
.arg("c")
.fails()
.stderr_contains("will not overwrite just-created 'c/f' with 'b/f'");
let result = ts.ucmd().arg("a/f").arg("b/f").arg("b/g").arg("c").fails();
#[cfg(not(unix))]
assert!(result
.stderr_str()
.contains("will not overwrite just-created 'c\\f' with 'b/f'"));
#[cfg(unix)]
assert!(result
.stderr_str()
.contains("will not overwrite just-created 'c/f' with 'b/f'"));
assert!(!at.plus("a").join("f").exists());
assert!(at.plus("b").join("f").exists());
assert!(!at.plus("b").join("g").exists());