Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-12-14 07:12:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

cksum/hashsum: fix the windows tests + improve some

Browse source
This commit is contained in:
Sylvestre Ledru 2024-06-02 12:24:50 +02:00
parent b1b6f28b76
commit 773d8cfbc6
3 changed files with 44 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/uucore/src/lib/features/checksum.rs
View file

@ -687,6 +687,7 @@ pub fn escape_filename(filename: &Path) -> (String, &'static str) {
let prefix = if escaped == original { "" } else { "\\" }; let prefix = if escaped == original { "" } else { "\\" };
(escaped, prefix) (escaped, prefix)
} }
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;

11
tests/by-util/test_cksum.rs
View file

@ -1192,8 +1192,17 @@ fn test_check_directory_error() {
"f", "f",
"BLAKE2b (d) = 786a02f742015903c6c6fd852552d272912f4740e15847618a86e217f71f5419d25e1031afee585313896444934eb04b903a685b1448b755d56f701afe9be2ce\n" "BLAKE2b (d) = 786a02f742015903c6c6fd852552d272912f4740e15847618a86e217f71f5419d25e1031afee585313896444934eb04b903a685b1448b755d56f701afe9be2ce\n"
); );
let err_msg: &str;
#[cfg(not(windows))]
{
err_msg = "cksum: d: Is a directory\n";
}
#[cfg(windows)]
{
err_msg = "cksum: d: Permission denied\n";
}
ucmd.arg("--check") ucmd.arg("--check")
.arg(at.subdir.join("f")) .arg(at.subdir.join("f"))
.fails() .fails()
.stderr_contains("cksum: d: Is a directory\n"); .stderr_contains(err_msg);
} }

37
tests/by-util/test_hashsum.rs
View file

@ -687,6 +687,8 @@ fn test_sha1_with_md5sum_should_fail() {
} }
#[test] #[test]
// Disabled on Windows because of the "*"
#[cfg(not(windows))]
fn test_check_one_two_space_star() { fn test_check_one_two_space_star() {
let scene = TestScenario::new(util_name!()); let scene = TestScenario::new(util_name!());
let at = &scene.fixtures; let at = &scene.fixtures;
@ -724,6 +726,8 @@ fn test_check_one_two_space_star() {
} }
#[test] #[test]
// Disabled on Windows because of the "*"
#[cfg(not(windows))]
fn test_check_space_star_or_not() { fn test_check_space_star_or_not() {
let scene = TestScenario::new(util_name!()); let scene = TestScenario::new(util_name!());
let at = &scene.fixtures; let at = &scene.fixtures;
@ -833,12 +837,21 @@ fn test_check_directory_error() {
at.mkdir("d"); at.mkdir("d");
at.write("in.md5", "d41d8cd98f00b204e9800998ecf8427f d\n"); at.write("in.md5", "d41d8cd98f00b204e9800998ecf8427f d\n");
let err_msg: &str;
#[cfg(not(windows))]
{
err_msg = "md5sum: d: Is a directory\n";
}
#[cfg(windows)]
{
err_msg = "md5sum: d: Permission denied\n";
}
scene scene
.ccmd("md5sum") .ccmd("md5sum")
.arg("--check") .arg("--check")
.arg(at.subdir.join("in.md5")) .arg(at.subdir.join("in.md5"))
.fails() .fails()
.stderr_contains("md5sum: d: Is a directory\n"); .stderr_contains(err_msg);
} }
#[test] #[test]
@ -854,8 +867,7 @@ fn test_check_quiet() {
.arg("--check") .arg("--check")
.arg(at.subdir.join("in.md5")) .arg(at.subdir.join("in.md5"))
.succeeds() .succeeds()
.stderr_is("") .no_output();
.stdout_is("");
// incorrect md5 // incorrect md5
at.write("in.md5", "d41d8cd98f00b204e9800998ecf8427f f\n"); at.write("in.md5", "d41d8cd98f00b204e9800998ecf8427f f\n");
@ -875,12 +887,29 @@ fn test_star_to_start() {
let at = &scene.fixtures; let at = &scene.fixtures;
at.touch("f"); at.touch("f");
at.write("in.md5", "d41d8cd98f00b204e9800998ecf8427e */dev/null\n"); at.write("in.md5", "d41d8cd98f00b204e9800998ecf8427e *f\n");
scene scene
.ccmd("md5sum") .ccmd("md5sum")
.arg("--check") .arg("--check")
.arg(at.subdir.join("in.md5")) .arg(at.subdir.join("in.md5"))
.succeeds() .succeeds()
.stdout_only("f: OK\n");
}
#[test]
fn test_b2sum_128() {
let scene = TestScenario::new(util_name!());
let at = &scene.fixtures;
at.touch("f");
at.write("in.b2sum", "786a02f742015903c6c6fd852552d272912f4740e15847618a86e217f71f5419d25e1031afee585313896444934eb04b903a685b1448b755d56f701afe9be2ce /dev/null\n");
scene
.ccmd("b2sum")
.arg("--check")
.arg("-l")
.arg("128")
.arg(at.subdir.join("in.b2sum"))
.succeeds()
.stderr_is("") .stderr_is("")
.stdout_is("/dev/null: OK\n"); .stdout_is("/dev/null: OK\n");
} }