Skip to content

id: adapt error message to match the one from GNU id #7836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 24, 2025
Merged

id: adapt error message to match the one from GNU id #7836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b5391e
id: fix error message & simplify tests
cakebaker Apr 24, 2025
48c4c82
id: remove unnecessary #[cfg(unix)] in tests
cakebaker Apr 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/uu/id/src/id.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
if (state.nflag || state.rflag) && default_format && !state.cflag {
return Err(USimpleError::new(
1,
"cannot print only names or real IDs in default format",
"printing only names or real IDs requires -u, -g, or -G",
));
}
if state.zflag && default_format && !state.cflag {
Expand Down
65 changes: 35 additions & 30 deletions tests/by-util/test_id.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ fn test_invalid_arg() {
}

#[test]
#[cfg(unix)]
#[allow(unused_mut)]
fn test_id_no_specified_user() {
let ts = TestScenario::new(util_name!());
Expand All @@ -44,7 +43,6 @@ fn test_id_no_specified_user() {
}

#[test]
#[cfg(unix)]
fn test_id_single_user() {
let test_users = [&whoami()[..]];

Expand Down Expand Up @@ -96,7 +94,6 @@ fn test_id_single_user() {
}

#[test]
#[cfg(unix)]
fn test_id_single_user_non_existing() {
let args = &["hopefully_non_existing_username"];
let ts = TestScenario::new(util_name!());
Expand All @@ -114,7 +111,6 @@ fn test_id_single_user_non_existing() {
}

#[test]
#[cfg(unix)]
fn test_id_name() {
let ts = TestScenario::new(util_name!());
for opt in ["--user", "--group", "--groups"] {
Expand All @@ -133,7 +129,6 @@ fn test_id_name() {
}

#[test]
#[cfg(unix)]
fn test_id_real() {
let ts = TestScenario::new(util_name!());
for opt in ["--user", "--group", "--groups"] {
Expand All @@ -148,7 +143,7 @@ fn test_id_real() {
}

#[test]
#[cfg(all(unix, not(any(target_os = "linux", target_os = "android"))))]
#[cfg(not(any(target_os = "linux", target_os = "android")))]
fn test_id_pretty_print() {
// `-p` is BSD only and not supported on GNU's `id`
let username = whoami();
Expand All @@ -157,7 +152,7 @@ fn test_id_pretty_print() {
}

#[test]
#[cfg(all(unix, not(any(target_os = "linux", target_os = "android"))))]
#[cfg(not(any(target_os = "linux", target_os = "android")))]
fn test_id_password_style() {
// `-P` is BSD only and not supported on GNU's `id`
let username = whoami();
Expand All @@ -166,7 +161,6 @@ fn test_id_password_style() {
}

#[test]
#[cfg(unix)]
fn test_id_multiple_users() {
unwrap_or_return!(check_coreutil_version(
util_name!(),
Expand Down Expand Up @@ -224,7 +218,6 @@ fn test_id_multiple_users() {
}

#[test]
#[cfg(unix)]
fn test_id_multiple_users_non_existing() {
unwrap_or_return!(check_coreutil_version(
util_name!(),
Expand Down Expand Up @@ -292,16 +285,19 @@ fn test_id_multiple_users_non_existing() {
}

#[test]
#[cfg(unix)]
fn test_id_name_or_real_with_default_format() {
for flag in ["-n", "--name", "-r", "--real"] {
new_ucmd!()
.arg(flag)
.fails()
.stderr_only("id: printing only names or real IDs requires -u, -g, or -G\n");
}
}

#[test]
fn test_id_default_format() {
let ts = TestScenario::new(util_name!());
for opt1 in ["--name", "--real"] {
// id: cannot print only names or real IDs in default format
let args = [opt1];
ts.ucmd()
.args(&args)
.fails()
.stderr_only(unwrap_or_return!(expected_result(&ts, &args)).stderr_str());
for opt2 in ["--user", "--group", "--groups"] {
// u/g/G n/r
let args = [opt2, opt1];
Expand Down Expand Up @@ -329,22 +325,32 @@ fn test_id_default_format() {
}

#[test]
#[cfg(unix)]
fn test_id_zero_with_default_format() {
for z_flag in ["-z", "--zero"] {
new_ucmd!()
.arg(z_flag)
.fails()
.stderr_only("id: option --zero not permitted in default format\n");
}
}

#[test]
fn test_id_zero_with_name_or_real() {
for z_flag in ["-z", "--zero"] {
for flag in ["-n", "--name", "-r", "--real"] {
new_ucmd!()
.args(&[z_flag, flag])
.fails()
.stderr_only("id: printing only names or real IDs requires -u, -g, or -G\n");
}
}
}

#[test]
fn test_id_zero() {
let ts = TestScenario::new(util_name!());
for z_flag in ["-z", "--zero"] {
// id: option --zero not permitted in default format
ts.ucmd()
.args(&[z_flag])
.fails()
.stderr_only(unwrap_or_return!(expected_result(&ts, &[z_flag])).stderr_str());
for opt1 in ["--name", "--real"] {
// id: cannot print only names or real IDs in default format
let args = [opt1, z_flag];
ts.ucmd()
.args(&args)
.fails()
.stderr_only(unwrap_or_return!(expected_result(&ts, &args)).stderr_str());
for opt2 in ["--user", "--group", "--groups"] {
// u/g/G n/r z
let args = [opt2, z_flag, opt1];
Expand Down Expand Up @@ -429,7 +435,6 @@ fn test_id_context() {
}

#[test]
#[cfg(unix)]
fn test_id_no_specified_user_posixly() {
// gnu/tests/id/no-context.sh

Expand All @@ -456,7 +461,7 @@ fn test_id_no_specified_user_posixly() {
}

#[test]
#[cfg(all(unix, not(target_os = "android")))]
#[cfg(not(target_os = "android"))]
fn test_id_pretty_print_password_record() {
// `-p` is BSD only and not supported on GNU's `id`.
// `-P` is our own extension, and not supported by either GNU nor BSD.
Expand Down
Loading