opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-29 17:36:38 +08:00
Code Issues Projects Releases Wiki Activity

test: fix races in bloomcache tests

Browse Source 
License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
This commit is contained in:
Jakub Sztandera
2016-07-04 20:34:07 +02:00
parent 98f877af81
commit e92e6662a7
1 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
blocks/blockstore/bloom_cache_test.go
View File

@ -2,12 +2,15 @@ package blockstore
import ( import (
"fmt" "fmt"
"sync"
"testing"
"time"
"github.com/ipfs/go-ipfs/blocks" "github.com/ipfs/go-ipfs/blocks"
ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore" ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
dsq "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/query" dsq "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/query"
syncds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/sync" syncds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/sync"
"testing"
"time"
) )
func TestReturnsErrorWhenSizeNegative(t *testing.T) { func TestReturnsErrorWhenSizeNegative(t *testing.T) {
@ -32,7 +35,10 @@ func TestRemoveCacheEntryOnDelete(t *testing.T) {
} }
cachedbs.Put(b) cachedbs.Put(b)
cd.Lock()
writeHitTheDatastore := false writeHitTheDatastore := false
cd.Unlock()
cd.SetFunc(func() { cd.SetFunc(func() {
writeHitTheDatastore = true writeHitTheDatastore = true
}) })
@ -93,34 +99,45 @@ func TestHasIsBloomCached(t *testing.T) {
} }
type callbackDatastore struct { type callbackDatastore struct {
sync.Mutex
f func() f func()
ds ds.Datastore ds ds.Datastore
} }
func (c *callbackDatastore) SetFunc(f func()) { c.f = f } func (c *callbackDatastore) SetFunc(f func()) {
c.Lock()
defer c.Unlock()
c.f = f
}
func (c *callbackDatastore) CallF() {
c.Lock()
defer c.Unlock()
c.f()
}
func (c *callbackDatastore) Put(key ds.Key, value interface{}) (err error) { func (c *callbackDatastore) Put(key ds.Key, value interface{}) (err error) {
c.f() c.CallF()
return c.ds.Put(key, value) return c.ds.Put(key, value)
} }
func (c *callbackDatastore) Get(key ds.Key) (value interface{}, err error) { func (c *callbackDatastore) Get(key ds.Key) (value interface{}, err error) {
c.f() c.CallF()
return c.ds.Get(key) return c.ds.Get(key)
} }
func (c *callbackDatastore) Has(key ds.Key) (exists bool, err error) { func (c *callbackDatastore) Has(key ds.Key) (exists bool, err error) {
c.f() c.CallF()
return c.ds.Has(key) return c.ds.Has(key)
} }
func (c *callbackDatastore) Delete(key ds.Key) (err error) { func (c *callbackDatastore) Delete(key ds.Key) (err error) {
c.f() c.CallF()
return c.ds.Delete(key) return c.ds.Delete(key)
} }
func (c *callbackDatastore) Query(q dsq.Query) (dsq.Results, error) { func (c *callbackDatastore) Query(q dsq.Query) (dsq.Results, error) {
c.f() c.CallF()
return c.ds.Query(q) return c.ds.Query(q)
} }