Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-12-14 07:12:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4784 from sunfishcode/sunfishcode/ls-order-time

Browse source 
Use `expected_result` in test_ls to avoid spurious failures
This commit is contained in:
Sylvestre Ledru 2023-04-26 22:46:06 +02:00 committed by GitHub
commit 686ad2d6d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show stats 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");
} }