mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-10 07:34:04 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #1341 from prometheus/beorn7/storage2

Browse source 
Remove a race condition from TestRetentionCutoff
This commit is contained in:
Björn Rabenstein 2016-01-25 16:46:02 +01:00
parent f50d90f3aa 99b9611351
commit 2f108452fc
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
storage/local/storage_test.go
View file

@ -377,7 +377,10 @@ func TestRetentionCutoff(t *testing.T) {
defer closer.Close()
// Stop maintenance loop to prevent actual purging.
s.loopStopping <- struct{}{}
close(s.loopStopping)
<-s.loopStopped
// Recreate channel to avoid panic when we really shut down.
s.loopStopping = make(chan struct{})
s.dropAfter = 1 * time.Hour