From e660c3abdb79d708a2b887c664efb033f584051a Mon Sep 17 00:00:00 2001 From: Olga Naidjonoka Date: Thu, 4 Apr 2024 18:02:01 +0300 Subject: [PATCH] fixed conflicts n fileinfo test --- auditbeat/module/file_integrity/fileinfo_test.go | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/auditbeat/module/file_integrity/fileinfo_test.go b/auditbeat/module/file_integrity/fileinfo_test.go index 99470c1bed3..ce9d62d1087 100644 --- a/auditbeat/module/file_integrity/fileinfo_test.go +++ b/auditbeat/module/file_integrity/fileinfo_test.go @@ -30,14 +30,10 @@ import ( ) func TestNewMetadata(t *testing.T) { -<<<<<<< HEAD - f, err := ioutil.TempFile("", "metadata") -======= // Can be removed after https://github.com/elastic/beats/issues/37701 is solved skipOnBuildkiteDarwin(t, "Group check") - f, err := os.CreateTemp(t.TempDir(), "metadata") ->>>>>>> aaa482983c (Deploy K8S Pipeline migration (#38659)) + f, err := ioutil.TempFile("", "metadata") if err != nil { t.Fatal(err) } @@ -103,14 +99,10 @@ func TestNewMetadata(t *testing.T) { } func TestSetUIDSetGIDBits(t *testing.T) { -<<<<<<< HEAD - f, err := ioutil.TempFile("", "setuid") -======= // Can be removed after https://github.com/elastic/beats/issues/37701 is solved skipOnBuildkiteDarwin(t, "Wheel permission issue") - f, err := os.CreateTemp(t.TempDir(), "setuid") ->>>>>>> aaa482983c (Deploy K8S Pipeline migration (#38659)) + f, err := ioutil.TempFile("", "setuid") if err != nil { t.Fatal(err) }