fixed conflicts n fileinfo test

elastic · Apr 4, 2024 · e660c3a · e660c3a
1 parent 6c69b24
commit e660c3a
Showing 1 changed file with 2 additions and 10 deletions.
diff --git 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)
 	}