roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Merge pull request #1969 from karalabe/fix-whisper-tests-datarace

Browse Source 
whisper: fix datarace in expiration test
This commit is contained in:
Felix Lange 2015-11-05 13:03:36 +01:00
commit 636f67f232
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
whisper/whisper_test.go
View File

@ -189,13 +189,22 @@ func TestMessageExpiration(t *testing.T) {
t.Fatalf("failed to inject message: %v", err) t.Fatalf("failed to inject message: %v", err)
} }
// Check that the message is inside the cache // Check that the message is inside the cache
if _, ok := node.messages[envelope.Hash()]; !ok { node.poolMu.RLock()
_, found := node.messages[envelope.Hash()]
node.poolMu.RUnlock()
if !found {
t.Fatalf("message not found in cache") t.Fatalf("message not found in cache")
} }
// Wait for expiration and check cache again // Wait for expiration and check cache again
time.Sleep(time.Second) // wait for expiration time.Sleep(time.Second) // wait for expiration
time.Sleep(expirationCycle) // wait for cleanup cycle time.Sleep(expirationCycle) // wait for cleanup cycle
if _, ok := node.messages[envelope.Hash()]; ok {
node.poolMu.RLock()
_, found = node.messages[envelope.Hash()]
node.poolMu.RUnlock()
if found {
t.Fatalf("message not expired from cache") t.Fatalf("message not expired from cache")
} }
} }