diff options
| author | Jack O'Connor <oconnor663@gmail.com> | 2023-02-04 10:13:34 -0800 |
|---|---|---|
| committer | Jack O'Connor <oconnor663@gmail.com> | 2023-02-04 10:15:25 -0800 |
| commit | 4c51c06008d9338c3ea81f3ac031b81c0deead9b (patch) | |
| tree | e74a983fe9f79cc5d2b0767d9bfa8214f1630a31 | |
| parent | f1dcbeadc238c940d0dcfa3608afee16c950685f (diff) | |
add a colon to the b3sum warning format
This matches what md5sum does.
| -rw-r--r-- | b3sum/src/main.rs | 2 | ||||
| -rw-r--r-- | b3sum/tests/cli_tests.rs | 23 |
2 files changed, 17 insertions, 8 deletions
diff --git a/b3sum/src/main.rs b/b3sum/src/main.rs index c44e11b..e3dbabf 100644 --- a/b3sum/src/main.rs +++ b/b3sum/src/main.rs @@ -585,7 +585,7 @@ fn main() -> Result<()> { } if args.check() && files_failed > 0 { eprintln!( - "{}: WARNING {} computed checksum{} did NOT match", + "{}: WARNING: {} computed checksum{} did NOT match", NAME, files_failed, if files_failed == 1 { "" } else { "s" }, diff --git a/b3sum/tests/cli_tests.rs b/b3sum/tests/cli_tests.rs index 9b9b9de..1112cf8 100644 --- a/b3sum/tests/cli_tests.rs +++ b/b3sum/tests/cli_tests.rs @@ -420,7 +420,10 @@ fn test_check() { c/d: OK\n"; assert!(!output.status.success()); assert_eq!(expected_check_failure, stdout); - assert_eq!("b3sum: WARNING 1 computed checksum did NOT match\n", 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 +445,10 @@ fn test_check() { ); assert!(!output.status.success()); assert_eq!(expected_check_failure, stdout); - assert_eq!("b3sum: WARNING 1 computed checksum did NOT match\n", 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 +463,10 @@ 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!("b3sum: WARNING 1 computed checksum did NOT match\n", stderr); + assert_eq!( + "b3sum: WARNING: 1 computed checksum did NOT match\n", + stderr, + ); } #[test] @@ -474,7 +483,7 @@ fn test_check_invalid_characters() { 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"; + b3sum: WARNING: 1 computed checksum did NOT match\n"; assert!(!output.status.success()); assert_eq!("", stdout); assert_eq!(expected_stderr, stderr); @@ -491,7 +500,7 @@ fn test_check_invalid_characters() { 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"; + b3sum: WARNING: 1 computed checksum did NOT match\n"; assert!(!output.status.success()); assert_eq!("", stdout); assert_eq!(expected_stderr, stderr); @@ -508,7 +517,7 @@ fn test_check_invalid_characters() { 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"; + b3sum: WARNING: 1 computed checksum did NOT match\n"; assert!(!output.status.success()); assert_eq!("", stdout); assert_eq!(expected_stderr, stderr); @@ -527,7 +536,7 @@ fn test_check_invalid_characters() { 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"; + b3sum: WARNING: 1 computed checksum did NOT match\n"; assert!(!output.status.success()); assert_eq!("", stdout); assert_eq!(expected_stderr, stderr); |