From d1e1e9ce0f862fcb5716487bf130273ecf065101 Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Tue, 30 Jan 2024 10:00:30 +0100 Subject: [PATCH] du: adapt error msg to match GNU's --- src/uu/du/src/du.rs | 4 ++-- tests/by-util/test_du.rs | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/uu/du/src/du.rs b/src/uu/du/src/du.rs index 62fcfceda..b71d5f44c 100644 --- a/src/uu/du/src/du.rs +++ b/src/uu/du/src/du.rs @@ -785,8 +785,8 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { .send(Err(USimpleError::new( 1, format!( - "{}: No such file or directory", - path.to_string_lossy().maybe_quote() + "cannot access {}: No such file or directory", + path.to_string_lossy().quote() ), ))) .map_err(|e| USimpleError::new(1, e.to_string()))?; diff --git a/tests/by-util/test_du.rs b/tests/by-util/test_du.rs index 9e4622c31..92469b6f5 100644 --- a/tests/by-util/test_du.rs +++ b/tests/by-util/test_du.rs @@ -173,11 +173,15 @@ fn test_du_with_posixly_correct() { } #[test] -fn test_du_basics_bad_name() { +fn test_du_non_existing_files() { new_ucmd!() - .arg("bad_name") + .arg("non_existing_a") + .arg("non_existing_b") .fails() - .stderr_only("du: bad_name: No such file or directory\n"); + .stderr_only(concat!( + "du: cannot access 'non_existing_a': No such file or directory\n", + "du: cannot access 'non_existing_b': No such file or directory\n" + )); } #[test]