RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-27 19:17:43 +00:00
Code Issues Activity

tests: fix tests for CICD environment

Browse source
This commit is contained in:
Jan Scheer 2021-07-08 01:32:39 +02:00
parent d59cd4fc4a
commit 14b348dd4b
No known key found for this signature in database
GPG key ID: C62AD4C29E2B9828
4 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/by-util/test_du.rs
View file

@ -573,8 +573,7 @@ fn test_du_bytes() {
#[cfg(all( #[cfg(all(
not(target_vendor = "apple"), not(target_vendor = "apple"),
not(target_os = "windows"), not(target_os = "windows"),
not(target_os = "freebsd"), not(target_os = "freebsd")
not(target_os = "linux")
))] ))]
result.stdout_contains("21529\t./subdir\n"); result.stdout_contains("21529\t./subdir\n");
} }

2
tests/by-util/test_groups.rs
View file

@ -3,6 +3,8 @@
// * For the full copyright and license information, please view the LICENSE // * For the full copyright and license information, please view the LICENSE
// * file that was distributed with this source code. // * file that was distributed with this source code.
//spell-checker: ignore coreutil
use crate::common::util::*; use crate::common::util::*;
const VERSION_MIN_MULTIPLE_USERS: &str = "8.31"; // this feature was introduced in GNU's coreutils 8.31 const VERSION_MIN_MULTIPLE_USERS: &str = "8.31"; // this feature was introduced in GNU's coreutils 8.31

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

@ -3,6 +3,7 @@
// * For the full copyright and license information, please view the LICENSE // * For the full copyright and license information, please view the LICENSE
// * file that was distributed with this source code. // * file that was distributed with this source code.
#[cfg(unix)]
use crate::common::util::*; use crate::common::util::*;
#[test] #[test]
@ -39,7 +40,9 @@ fn test_normal_compare_env() {
if whoami == "nobody" { if whoami == "nobody" {
println!("test skipped:"); println!("test skipped:");
return; return;
} else { } else if !is_ci() {
new_ucmd!().succeeds().stdout_is(format!("{}\n", whoami)); new_ucmd!().succeeds().stdout_is(format!("{}\n", whoami));
} else {
println!("test skipped:");
} }
} }

12
tests/common/util.rs
View file

@ -10,6 +10,7 @@
use pretty_assertions::assert_eq; use pretty_assertions::assert_eq;
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
use rlimit::{prlimit, rlim}; use rlimit::{prlimit, rlim};
#[cfg(unix)]
use std::borrow::Cow; use std::borrow::Cow;
use std::env; use std::env;
#[cfg(not(windows))] #[cfg(not(windows))]
@ -1456,9 +1457,10 @@ mod tests {
#[cfg(unix)] #[cfg(unix)]
fn test_check_coreutil_version() { fn test_check_coreutil_version() {
match check_coreutil_version("id", VERSION_MIN) { match check_coreutil_version("id", VERSION_MIN) {
Ok(s) => s.starts_with("uutils-tests-"), Ok(s) => assert!(s.starts_with("uutils-tests-")),
Err(s) => s.starts_with("uutils-tests-warning"), Err(s) => assert!(s.starts_with("uutils-tests-warning")),
}; };
#[cfg(target_os = "linux")]
std::assert_eq!( std::assert_eq!(
check_coreutil_version("no test name", VERSION_MIN), check_coreutil_version("no test name", VERSION_MIN),
Err("uutils-tests-warning: 'no test name' \ Err("uutils-tests-warning: 'no test name' \
@ -1471,7 +1473,11 @@ mod tests {
#[cfg(unix)] #[cfg(unix)]
fn test_expected_result() { fn test_expected_result() {
let ts = TestScenario::new("id"); let ts = TestScenario::new("id");
assert!(expected_result(&ts, &[]).is_ok()); // assert!(expected_result(&ts, &[]).is_ok());
match expected_result(&ts, &[]) {
Ok(r) => assert!(r.succeeded()),
Err(s) => assert!(s.starts_with("uutils-tests-warning")),
}
let ts = TestScenario::new("no test name"); let ts = TestScenario::new("no test name");
assert!(expected_result(&ts, &[]).is_err()); assert!(expected_result(&ts, &[]).is_err());
} }