RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

whoami/id: refactor tests for #1982

Browse source
This commit is contained in:
Jan Scheer 2021-04-17 22:29:07 +02:00
parent 045eb0088a
commit 48121daf94
2 changed files with 117 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

128
tests/by-util/test_id.rs
View file

@ -1,11 +1,32 @@
use crate::common::util::*; use crate::common::util::*;
// Apparently some CI environments have configuration issues, e.g. with 'whoami' and 'id'.
// If we are running inside the CI and "needle" is in "stderr" skipping this test is
// considered okay. If we are not inside the CI this calls assert!(result.success).
//
// From the Logs: "Build (ubuntu-18.04, x86_64-unknown-linux-gnu, feat_os_unix, use-cross)"
// stderr: "whoami: cannot find name for user ID 1001"
// Maybe: "adduser --uid 1001 username" can put things right?
// stderr = id: error: Could not find uid 1001: No such id: 1001
fn skipping_test_is_okay(result: &CmdResult, needle: &str) -> bool {
if !result.succeeded() {
println!("result.stdout = {}", result.stdout_str());
println!("result.stderr = {}", result.stderr_str());
if is_ci() && result.stderr_str().contains(needle) {
println!("test skipped:");
return true;
} else {
result.success();
}
}
false
}
fn return_whoami_username() -> String { fn return_whoami_username() -> String {
let scene = TestScenario::new("whoami"); let scene = TestScenario::new("whoami");
let result = scene.cmd("whoami").run(); let result = scene.cmd("whoami").run();
if is_ci() && result.stderr.contains("cannot find name for user ID") { if skipping_test_is_okay(&result, "whoami: cannot find name for user ID") {
// In the CI, some server are failing to return whoami. println!("test skipped:");
// As seems to be a configuration issue, ignoring it
return String::from(""); return String::from("");
} }
@ -14,40 +35,41 @@ fn return_whoami_username() -> String {
#[test] #[test]
fn test_id() { fn test_id() {
let result = new_ucmd!().arg("-u").run(); let scene = TestScenario::new(util_name!());
if result.stderr.contains("cannot find name for user ID") {
// In the CI, some server are failing to return whoami. let result = scene.ucmd().arg("-u").succeeds();
// As seems to be a configuration issue, ignoring it let uid = result.stdout_str().trim();
let result = scene.ucmd().run();
if skipping_test_is_okay(&result, "Could not find uid") {
return; return;
} }
let uid = result.success().stdout_str().trim();
let result = new_ucmd!().run();
if is_ci() && result.stderr.contains("cannot find name for user ID") {
// In the CI, some server are failing to return whoami.
// As seems to be a configuration issue, ignoring it
return;
}
if !result.stderr_str().contains("Could not find uid") {
// Verify that the id found by --user/-u exists in the list // Verify that the id found by --user/-u exists in the list
result.success().stdout_contains(&uid); result.stdout_contains(uid);
}
} }
#[test] #[test]
fn test_id_from_name() { fn test_id_from_name() {
let username = return_whoami_username(); let username = return_whoami_username();
if username == "" { if username.is_empty() {
// Sometimes, the CI is failing here return;
}
let scene = TestScenario::new(util_name!());
let result = scene.ucmd().arg(&username).run();
if skipping_test_is_okay(&result, "Could not find uid") {
return; return;
} }
let result = new_ucmd!().arg(&username).succeeds();
let uid = result.stdout_str().trim(); let uid = result.stdout_str().trim();
new_ucmd!() let result = scene.ucmd().run();
.succeeds() if skipping_test_is_okay(&result, "Could not find uid") {
return;
}
result
// Verify that the id found by --user/-u exists in the list // Verify that the id found by --user/-u exists in the list
.stdout_contains(uid) .stdout_contains(uid)
// Verify that the username found by whoami exists in the list // Verify that the username found by whoami exists in the list
@ -56,48 +78,42 @@ fn test_id_from_name() {
#[test] #[test]
fn test_id_name_from_id() { fn test_id_name_from_id() {
let result = new_ucmd!().arg("-u").succeeds(); let result = new_ucmd!().arg("-nu").run();
let uid = result.stdout_str().trim();
let result = new_ucmd!().arg("-nu").arg(uid).run(); let username_id = result.stdout_str().trim();
if is_ci() && result.stderr.contains("No such user/group") {
// In the CI, some server are failing to return whoami. let username_whoami = return_whoami_username();
// As seems to be a configuration issue, ignoring it if username_whoami.is_empty() {
return; return;
} }
let username_id = result.success().stdout_str().trim();
let scene = TestScenario::new("whoami");
let result = scene.cmd("whoami").succeeds();
let username_whoami = result.stdout_str().trim();
assert_eq!(username_id, username_whoami); assert_eq!(username_id, username_whoami);
} }
#[test] #[test]
fn test_id_group() { fn test_id_group() {
let mut result = new_ucmd!().arg("-g").succeeds(); let scene = TestScenario::new(util_name!());
let mut result = scene.ucmd().arg("-g").succeeds();
let s1 = result.stdout_str().trim(); let s1 = result.stdout_str().trim();
assert!(s1.parse::<f64>().is_ok()); assert!(s1.parse::<f64>().is_ok());
result = new_ucmd!().arg("--group").succeeds(); result = scene.ucmd().arg("--group").succeeds();
let s1 = result.stdout_str().trim(); let s1 = result.stdout_str().trim();
assert!(s1.parse::<f64>().is_ok()); assert!(s1.parse::<f64>().is_ok());
} }
#[test] #[test]
fn test_id_groups() { fn test_id_groups() {
let result = new_ucmd!().arg("-G").succeeds(); let scene = TestScenario::new(util_name!());
assert!(result.success);
let result = scene.ucmd().arg("-G").succeeds();
let groups = result.stdout_str().trim().split_whitespace(); let groups = result.stdout_str().trim().split_whitespace();
for s in groups { for s in groups {
assert!(s.parse::<f64>().is_ok()); assert!(s.parse::<f64>().is_ok());
} }
let result = new_ucmd!().arg("--groups").succeeds(); let result = scene.ucmd().arg("--groups").succeeds();
assert!(result.success);
let groups = result.stdout_str().trim().split_whitespace(); let groups = result.stdout_str().trim().split_whitespace();
for s in groups { for s in groups {
assert!(s.parse::<f64>().is_ok()); assert!(s.parse::<f64>().is_ok());
@ -106,11 +122,13 @@ fn test_id_groups() {
#[test] #[test]
fn test_id_user() { fn test_id_user() {
let mut result = new_ucmd!().arg("-u").succeeds(); let scene = TestScenario::new(util_name!());
let result = scene.ucmd().arg("-u").succeeds();
let s1 = result.stdout_str().trim(); let s1 = result.stdout_str().trim();
assert!(s1.parse::<f64>().is_ok()); assert!(s1.parse::<f64>().is_ok());
result = new_ucmd!().arg("--user").succeeds(); let result = scene.ucmd().arg("--user").succeeds();
let s1 = result.stdout_str().trim(); let s1 = result.stdout_str().trim();
assert!(s1.parse::<f64>().is_ok()); assert!(s1.parse::<f64>().is_ok());
} }
@ -118,28 +136,34 @@ fn test_id_user() {
#[test] #[test]
fn test_id_pretty_print() { fn test_id_pretty_print() {
let username = return_whoami_username(); let username = return_whoami_username();
if username == "" { if username.is_empty() {
// Sometimes, the CI is failing here
return; return;
} }
let result = new_ucmd!().arg("-p").run(); let scene = TestScenario::new(util_name!());
if result.stdout_str().trim() == "" { let result = scene.ucmd().arg("-p").run();
// Sometimes, the CI is failing here with if result.stdout_str().trim().is_empty() {
// old rust versions on Linux // this fails only on: "MinRustV (ubuntu-latest, feat_os_unix)"
// `rustc 1.40.0 (73528e339 2019-12-16)`
// run: /home/runner/work/coreutils/coreutils/target/debug/coreutils id -p
// thread 'test_id::test_id_pretty_print' panicked at 'Command was expected to succeed.
// stdout =
// stderr = ', tests/common/util.rs:157:13
println!("test skipped:");
return; return;
} }
result.success().stdout_contains(username); result.success().stdout_contains(username);
} }
#[test] #[test]
fn test_id_password_style() { fn test_id_password_style() {
let username = return_whoami_username(); let username = return_whoami_username();
if username == "" { if username.is_empty() {
// Sometimes, the CI is failing here
return; return;
} }
let result = new_ucmd!().arg("-P").succeeds(); let result = new_ucmd!().arg("-P").succeeds();
assert!(result.stdout_str().starts_with(&username)); assert!(result.stdout_str().starts_with(&username));
} }

67
tests/by-util/test_whoami.rs
View file

@ -1,50 +1,63 @@
use crate::common::util::*; use crate::common::util::*;
use std::env;
// Apparently some CI environments have configuration issues, e.g. with 'whoami' and 'id'.
// If we are running inside the CI and "needle" is in "stderr" skipping this test is
// considered okay. If we are not inside the CI this calls assert!(result.success).
//
// From the Logs: "Build (ubuntu-18.04, x86_64-unknown-linux-gnu, feat_os_unix, use-cross)"
// stderr: "whoami: error: failed to get username"
// Maybe: "adduser --uid 1001 username" can put things right?
fn skipping_test_is_okay(result: &CmdResult, needle: &str) -> bool {
if !result.succeeded() {
println!("result.stdout = {}", result.stdout_str());
println!("result.stderr = {}", result.stderr_str());
if is_ci() && result.stderr_str().contains(needle) {
println!("test skipped:");
return true;
} else {
result.success();
}
}
false
}
#[test] #[test]
fn test_normal() { fn test_normal() {
let (_, mut ucmd) = at_and_ucmd!(); let (_, mut ucmd) = at_and_ucmd!();
let result = ucmd.run(); let result = ucmd.run();
println!("result.stdout = {}", result.stdout);
println!("result.stderr = {}", result.stderr);
println!("env::var(CI).is_ok() = {}", env::var("CI").is_ok());
for (key, value) in env::vars() { // use std::env;
println!("{}: {}", key, value); // println!("env::var(CI).is_ok() = {}", env::var("CI").is_ok());
} // for (key, value) in env::vars() {
if is_ci() && result.stderr.contains("failed to get username") { // println!("{}: {}", key, value);
// In the CI, some server are failing to return whoami. // }
// As seems to be a configuration issue, ignoring it
if skipping_test_is_okay(&result, "failed to get username") {
return; return;
} }
assert!(result.success); result.no_stderr();
assert!(!result.stdout.trim().is_empty()); assert!(!result.stdout_str().trim().is_empty());
} }
#[test] #[test]
#[cfg(not(windows))] #[cfg(not(windows))]
fn test_normal_compare_id() { fn test_normal_compare_id() {
let (_, mut ucmd) = at_and_ucmd!(); let scene = TestScenario::new(util_name!());
let result = ucmd.run(); let result_ucmd = scene.ucmd().run();
if skipping_test_is_okay(&result_ucmd, "failed to get username") {
println!("result.stdout = {}", result.stdout);
println!("result.stderr = {}", result.stderr);
if is_ci() && result.stderr.contains("failed to get username") {
// In the CI, some server are failing to return whoami.
// As seems to be a configuration issue, ignoring it
return; return;
} }
assert!(result.success);
let ts = TestScenario::new("id");
let id = ts.cmd("id").arg("-un").run();
if is_ci() && id.stderr.contains("cannot find name for user ID") { let result_cmd = scene.cmd("id").arg("-un").run();
// In the CI, some server are failing to return whoami. if skipping_test_is_okay(&result_cmd, "cannot find name for user ID") {
// As seems to be a configuration issue, ignoring it
return; return;
} }
assert_eq!(result.stdout.trim(), id.stdout.trim());
assert_eq!(
result_ucmd.stdout_str().trim(),
result_cmd.stdout_str().trim()
);
} }