diff options
| author | joveian <[email protected]> | 2023-01-12 17:33:06 -0800 |
|---|---|---|
| committer | Jack O'Connor <[email protected]> | 2023-02-04 10:14:52 -0800 |
| commit | 4c819d01bcea974bbac8199dafe9ab68a24f796b (patch) | |
| tree | 52c1317e613f14f5fa850cf14b413af6a406f4de /b3sum/tests | |
| parent | c303437aabae538b7f019ef6059d8cdfb9699032 (diff) | |
Add --check summary of failures
Add a warning to stderr at the end similar to other *sum utilities when --check is used and some files failed verification.
At least the last part of the comment above check_one_checkfile seemed to be incorrect so I removed that comment.
Fixes #283
Diffstat (limited to 'b3sum/tests')
| -rw-r--r-- | b3sum/tests/cli_tests.rs | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/b3sum/tests/cli_tests.rs b/b3sum/tests/cli_tests.rs index 6b0ca5a..9b9b9de 100644 --- a/b3sum/tests/cli_tests.rs +++ b/b3sum/tests/cli_tests.rs @@ -420,7 +420,7 @@ fn test_check() { c/d: OK\n"; assert!(!output.status.success()); assert_eq!(expected_check_failure, stdout); - assert_eq!("", stderr); + assert_eq!("b3sum: WARNING 1 computed checksum did NOT match\n", stderr); // Delete one of the files and check again. fs::remove_file(dir.path().join("b")).unwrap(); @@ -442,7 +442,7 @@ fn test_check() { ); assert!(!output.status.success()); assert_eq!(expected_check_failure, stdout); - assert_eq!("", stderr); + assert_eq!("b3sum: WARNING 1 computed checksum did NOT match\n", stderr); // Confirm that --quiet suppresses the OKs but not the FAILEDs. let output = cmd!(b3sum_exe(), "--check", "--quiet", &checkfile_path) @@ -457,7 +457,7 @@ fn test_check() { let expected_check_failure = format!("b: FAILED ({})\n", open_file_error); assert!(!output.status.success()); assert_eq!(expected_check_failure, stdout); - assert_eq!("", stderr); + assert_eq!("b3sum: WARNING 1 computed checksum did NOT match\n", stderr); } #[test] @@ -472,9 +472,12 @@ fn test_check_invalid_characters() { .unwrap(); let stdout = std::str::from_utf8(&output.stdout).unwrap(); let stderr = std::str::from_utf8(&output.stderr).unwrap(); + let expected_stderr = "\ + b3sum: Null character in path\n\ + b3sum: WARNING 1 computed checksum did NOT match\n"; assert!(!output.status.success()); assert_eq!("", stdout); - assert_eq!("b3sum: Null character in path\n", stderr); + assert_eq!(expected_stderr, stderr); // Check that a Unicode replacement character in the path fails. let output = cmd!(b3sum_exe(), "--check") @@ -486,9 +489,12 @@ fn test_check_invalid_characters() { .unwrap(); let stdout = std::str::from_utf8(&output.stdout).unwrap(); let stderr = std::str::from_utf8(&output.stderr).unwrap(); + let expected_stderr = "\ + b3sum: Unicode replacement character in path\n\ + b3sum: WARNING 1 computed checksum did NOT match\n"; assert!(!output.status.success()); assert_eq!("", stdout); - assert_eq!("b3sum: Unicode replacement character in path\n", stderr); + assert_eq!(expected_stderr, stderr); // Check that an invalid escape sequence in the path fails. let output = cmd!(b3sum_exe(), "--check") @@ -500,9 +506,12 @@ fn test_check_invalid_characters() { .unwrap(); let stdout = std::str::from_utf8(&output.stdout).unwrap(); let stderr = std::str::from_utf8(&output.stderr).unwrap(); + let expected_stderr = "\ + b3sum: Invalid backslash escape\n\ + b3sum: WARNING 1 computed checksum did NOT match\n"; assert!(!output.status.success()); assert_eq!("", stdout); - assert_eq!("b3sum: Invalid backslash escape\n", stderr); + assert_eq!(expected_stderr, stderr); // Windows also forbids literal backslashes. Check for that if and only if // we're on Windows. @@ -516,9 +525,12 @@ fn test_check_invalid_characters() { .unwrap(); let stdout = std::str::from_utf8(&output.stdout).unwrap(); let stderr = std::str::from_utf8(&output.stderr).unwrap(); + let expected_stderr = "\ + b3sum: Backslash in path\n\ + b3sum: WARNING 1 computed checksum did NOT match\n"; assert!(!output.status.success()); assert_eq!("", stdout); - assert_eq!("b3sum: Backslash in path\n", stderr); + assert_eq!(expected_stderr, stderr); } } |
