From 554c0ad593da78c5b5b7f65f5bd803a6be9fa772 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 14 Apr 2025 09:46:05 +0200 Subject: [PATCH 1/4] tail: Ignore a test on selinux test_follow_when_files_are_pointing_to_same_relative_file_and_file_stays_same_size is flaky --- tests/by-util/test_tail.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/by-util/test_tail.rs b/tests/by-util/test_tail.rs index cebc8fc39..0697ec299 100644 --- a/tests/by-util/test_tail.rs +++ b/tests/by-util/test_tail.rs @@ -4379,7 +4379,8 @@ fn test_args_when_directory_given_shorthand_big_f_together_with_retry() { not(target_vendor = "apple"), not(target_os = "windows"), not(target_os = "freebsd"), - not(target_os = "openbsd") + not(target_os = "openbsd"), + not(feature = "feat_selinux") // flaky ))] fn test_follow_when_files_are_pointing_to_same_relative_file_and_file_stays_same_size() { let scene = TestScenario::new(util_name!()); From 7d86f0b5f24fc725b888e8f7a9fe78c2beb29638 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 14 Apr 2025 10:04:14 +0200 Subject: [PATCH 2/4] tail: test_follow_name_truncate4 is also flaky on selinux --- tests/by-util/test_tail.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/by-util/test_tail.rs b/tests/by-util/test_tail.rs index 0697ec299..7e468ad20 100644 --- a/tests/by-util/test_tail.rs +++ b/tests/by-util/test_tail.rs @@ -1965,8 +1965,13 @@ fn test_follow_name_truncate3() { .stdout_only(expected_stdout); } + #[test] -#[cfg(all(not(target_vendor = "apple"), not(target_os = "windows")))] // FIXME: for currently not working platforms +#[cfg(all( + not(target_os = "apple"), + not(target_os = "windows"), + not(feature = "feat_selinux") // flaky +))] // FIXME: for currently not working platforms fn test_follow_name_truncate4() { // Truncating a file with the same content it already has should not trigger a truncate event From bbbc7b5147045ec7776e23c2d05ae50626d7e073 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 14 Apr 2025 10:25:30 +0200 Subject: [PATCH 3/4] Remove extra space --- tests/by-util/test_tail.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/by-util/test_tail.rs b/tests/by-util/test_tail.rs index 7e468ad20..b7776b18d 100644 --- a/tests/by-util/test_tail.rs +++ b/tests/by-util/test_tail.rs @@ -1965,7 +1965,6 @@ fn test_follow_name_truncate3() { .stdout_only(expected_stdout); } - #[test] #[cfg(all( not(target_os = "apple"), From a289e9f0fbe039fe82756d61f037fb2b92a639f1 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 14 Apr 2025 10:29:11 +0200 Subject: [PATCH 4/4] fix declaration --- tests/by-util/test_tail.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/by-util/test_tail.rs b/tests/by-util/test_tail.rs index b7776b18d..f04aae30e 100644 --- a/tests/by-util/test_tail.rs +++ b/tests/by-util/test_tail.rs @@ -1967,7 +1967,7 @@ fn test_follow_name_truncate3() { #[test] #[cfg(all( - not(target_os = "apple"), + not(target_vendor = "apple"), not(target_os = "windows"), not(feature = "feat_selinux") // flaky ))] // FIXME: for currently not working platforms