From 8bb3bbc3cdb38dd5bc12306fe720e95a7cc65c29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Duffeck?= <andre.duffeck@firondu.de>
Date: Mon, 3 Jun 2024 09:46:30 +0200
Subject: [PATCH] Try to fix the flakiness

---
 .drone.star                            | 3 ++-
 Makefile                               | 1 +
 pkg/storage/fs/posix/tree/tree_test.go | 5 ++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.drone.star b/.drone.star
index dfb9275a61e..a99dda12ddc 100644
--- a/.drone.star
+++ b/.drone.star
@@ -148,7 +148,7 @@ def coverage():
                     },
                 },
                 "commands": [
-                    "make test",
+                    "git config --global --add safe.directory /drone/src; make test",
                 ],
             },
         ],
@@ -769,6 +769,7 @@ def posixfsIntegrationTests(parallelRuns, skipExceptParts = []):
                             "DIVIDE_INTO_NUM_PARTS": parallelRuns,
                             "RUN_PART": runPart,
                             "EXPECTED_FAILURES_FILE": "/drone/src/tests/acceptance/expected-failures-on-POSIX-storage.md",
+                            "BEHAT_FEATURE": 'tests/acceptance/features/coreApiAuth/webDavSpecialURLs.feature:102',
                         },
                     },
                 ],
diff --git a/Makefile b/Makefile
index ea4233dfe22..cab1af3d088 100644
--- a/Makefile
+++ b/Makefile
@@ -158,6 +158,7 @@ test-go-version:
 
 .PHONY: build-ci
 build-ci: off
+	git config --global --add safe.directory '*'
 	go build -ldflags ${BUILD_FLAGS} -o ./cmd/revad/revad ./cmd/revad
 	go build -ldflags ${BUILD_FLAGS} -o ./cmd/reva/reva ./cmd/reva
 
diff --git a/pkg/storage/fs/posix/tree/tree_test.go b/pkg/storage/fs/posix/tree/tree_test.go
index 4b85cd44ebe..1f7c31086cf 100644
--- a/pkg/storage/fs/posix/tree/tree_test.go
+++ b/pkg/storage/fs/posix/tree/tree_test.go
@@ -59,12 +59,11 @@ var _ = SynchronizedBeforeSuite(func() {
 			}
 
 			if strings.Contains(name, "inotifywait") {
+				// Give it some time to setup the watches
+				time.Sleep(2 * time.Second)
 				return true
 			}
 		}
-
-		// Give it some time to setup the watches
-		time.Sleep(2 * time.Second)
 		return false
 	}).Should(BeTrue())
 }, func() {})