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

Use expected_result in test_ls to avoid spurious failures

Browse source 
As the existing comment says, the expected output here is dependent on
the platform, so use the `expected_result` utility to avoid hard-coding
specific results for each platform.

This fixes spurious failures on my machine.
This commit is contained in:
Dan Gohman 2023-04-25 05:14:09 -07:00
parent 0984097103
commit eba000ddcc
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
tests/by-util/test_ls.rs
View file

@ -1,6 +1,6 @@
// spell-checker:ignore (words) READMECAREFULLY birthtime doesntexist oneline somebackup lrwx somefile somegroup somehiddenbackup somehiddenfile tabsize aaaaaaaa bbbb cccc dddddddd ncccc // spell-checker:ignore (words) READMECAREFULLY birthtime doesntexist oneline somebackup lrwx somefile somegroup somehiddenbackup somehiddenfile tabsize aaaaaaaa bbbb cccc dddddddd ncccc
#[cfg(feature = "feat_selinux")] #[cfg(any(unix, feature = "feat_selinux"))]
use crate::common::util::expected_result; use crate::common::util::expected_result;
use crate::common::util::TestScenario; use crate::common::util::TestScenario;
#[cfg(all(unix, feature = "chmod"))] #[cfg(all(unix, feature = "chmod"))]
@ -1776,9 +1776,15 @@ fn test_ls_order_time() {
at.open("test-4").metadata().unwrap().accessed().unwrap(); at.open("test-4").metadata().unwrap().accessed().unwrap();
// It seems to be dependent on the platform whether the access time is actually set // It seems to be dependent on the platform whether the access time is actually set
#[cfg(all(unix, not(target_os = "android")))] #[cfg(unix)]
result.stdout_only("test-3\ntest-4\ntest-2\ntest-1\n"); {
#[cfg(any(windows, target_os = "android"))] let expected = unwrap_or_return!(expected_result(&scene, &["-t", arg]));
at.open("test-3").metadata().unwrap().accessed().unwrap();
at.open("test-4").metadata().unwrap().accessed().unwrap();
result.stdout_only(expected.stdout_str());
}
#[cfg(windows)]
result.stdout_only("test-4\ntest-3\ntest-2\ntest-1\n"); result.stdout_only("test-4\ntest-3\ntest-2\ntest-1\n");
} }