From e05a7e230f7a72b6c2e7d789006df63b688c30e2 Mon Sep 17 00:00:00 2001 From: Deluan Date: Tue, 10 Feb 2026 11:25:17 -0500 Subject: [PATCH] fix: prevent data race on conf.Server during cleanup in e2e tests Signed-off-by: Deluan --- server/e2e/e2e_suite_test.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server/e2e/e2e_suite_test.go b/server/e2e/e2e_suite_test.go index e658d1fd2..479f9c680 100644 --- a/server/e2e/e2e_suite_test.go +++ b/server/e2e/e2e_suite_test.go @@ -318,6 +318,11 @@ func setupTestDB() { ctx = request.WithUser(GinkgoT().Context(), adminUser) DeferCleanup(configtest.SetupConfig()) + DeferCleanup(func() { + // Wait for any background scan (e.g. from startScan endpoint) to finish + // before config cleanup runs, to avoid a data race on conf.Server. + Eventually(scanner.IsScanning).Should(BeFalse()) + }) conf.Server.MusicFolder = "fake:///music" conf.Server.DevExternalScanner = false