From 216bd2ceba2eb1708b7bdc7d69cf2984ff972cbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jano=C5=A1=20Gulja=C5=A1?= Date: Mon, 4 Mar 2019 22:19:57 +0100 Subject: [PATCH] swarm/storage/localstore: fix testDB_collectGarbageWorker data race (#19206) --- swarm/storage/localstore/gc_test.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/swarm/storage/localstore/gc_test.go b/swarm/storage/localstore/gc_test.go index 3964c16d5..c2ad774d3 100644 --- a/swarm/storage/localstore/gc_test.go +++ b/swarm/storage/localstore/gc_test.go @@ -51,14 +51,16 @@ func testDB_collectGarbageWorker(t *testing.T) { chunkCount := 150 - testHookCollectGarbageChan := make(chan int64) - defer setTestHookCollectGarbage(func(collectedCount int64) { - testHookCollectGarbageChan <- collectedCount - })() - db, cleanupFunc := newTestDB(t, &Options{ Capacity: 100, }) + testHookCollectGarbageChan := make(chan int64) + defer setTestHookCollectGarbage(func(collectedCount int64) { + select { + case testHookCollectGarbageChan <- collectedCount: + case <-db.close: + } + })() defer cleanupFunc() uploader := db.NewPutter(ModePutUpload)