From 8b8c2ff8ad4cc4cceaec4e6cb09fcbfea00b5aea Mon Sep 17 00:00:00 2001 From: Olga Naidjonoka Date: Wed, 1 May 2024 00:41:14 +0300 Subject: [PATCH] disabled monitor test on macos buildkite --- auditbeat/module/file_integrity/fileinfo_test.go | 2 +- auditbeat/module/file_integrity/monitor/monitor_test.go | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/auditbeat/module/file_integrity/fileinfo_test.go b/auditbeat/module/file_integrity/fileinfo_test.go index 4aa63d0a4005..ec6bd052aa4e 100644 --- a/auditbeat/module/file_integrity/fileinfo_test.go +++ b/auditbeat/module/file_integrity/fileinfo_test.go @@ -157,6 +157,6 @@ func TestSetUIDSetGIDBits(t *testing.T) { func skipOnBuildkiteDarwin(t testing.TB, reason string) { if os.Getenv("BUILDKITE") == "true" && runtime.GOOS == "darwin" { - t.Skip("Skip test on Buildkite MacOS: Wheel permission while expected staff") + t.Skip(reason) } } diff --git a/auditbeat/module/file_integrity/monitor/monitor_test.go b/auditbeat/module/file_integrity/monitor/monitor_test.go index 2f66d6469b26..8f4ef23226b4 100644 --- a/auditbeat/module/file_integrity/monitor/monitor_test.go +++ b/auditbeat/module/file_integrity/monitor/monitor_test.go @@ -144,6 +144,9 @@ func TestRecursiveSubdirPermissions(t *testing.T) { t.Skip("Skipping permissions test on Windows") } + // Can be removed after https://github.com/elastic/ingest-dev/issues/3268 is solved + skipOnBuildkiteDarwin(t, "TMP dir issue on MacOS") + if os.Getuid() == 0 { t.Skip("skipping as root can access every file and thus this unittest will fail") return @@ -429,3 +432,9 @@ func assertNoError(t *testing.T, err error) { t.Fatal(err) } } + +func skipOnBuildkiteDarwin(t testing.TB, reason string) { + if os.Getenv("BUILDKITE") == "true" && runtime.GOOS == "darwin" { + t.Skip(reason) + } +}