forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 02:42:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

swarm/storage/localstore: protect slices in push subs test

Browse source
This commit is contained in:
Janos Guljas 2019-01-14 11:22:12 +01:00
parent 5ddc75f2d0
commit 87bbd617bd
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
swarm/storage/localstore/subscription_push_test.go
View file

@ -20,6 +20,7 @@ import (
"bytes" "bytes"
"context" "context"
"fmt" "fmt"
"sync"
"testing" "testing"
"time" "time"
@ -38,6 +39,7 @@ func TestDB_SubscribePush(t *testing.T) {
uploader := db.NewPutter(ModePutUpload) uploader := db.NewPutter(ModePutUpload)
chunks := make([]storage.Chunk, 0) chunks := make([]storage.Chunk, 0)
var chunksMu sync.Mutex
uploadRandomChunks := func(count int) { uploadRandomChunks := func(count int) {
for i := 0; i < count; i++ { for i := 0; i < count; i++ {
@ -48,7 +50,9 @@ func TestDB_SubscribePush(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
chunksMu.Lock()
chunks = append(chunks, chunk) chunks = append(chunks, chunk)
chunksMu.Unlock()
} }
} }
@ -76,7 +80,9 @@ func TestDB_SubscribePush(t *testing.T) {
if !ok { if !ok {
return return
} }
chunksMu.Lock()
want := chunks[i] want := chunks[i]
chunksMu.Unlock()
var err error var err error
if !bytes.Equal(got.Data(), want.Data()) { if !bytes.Equal(got.Data(), want.Data()) {
err = fmt.Errorf("got chunk %v data %x, want %x", i, got.Data(), want.Data()) err = fmt.Errorf("got chunk %v data %x, want %x", i, got.Data(), want.Data())
@ -118,6 +124,7 @@ func TestDB_SubscribePush_multiple(t *testing.T) {
uploader := db.NewPutter(ModePutUpload) uploader := db.NewPutter(ModePutUpload)
addrs := make([]storage.Address, 0) addrs := make([]storage.Address, 0)
var addrsMu sync.Mutex
uploadRandomChunks := func(count int) { uploadRandomChunks := func(count int) {
for i := 0; i < count; i++ { for i := 0; i < count; i++ {
@ -128,7 +135,9 @@ func TestDB_SubscribePush_multiple(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
addrsMu.Lock()
addrs = append(addrs, chunk.Address()) addrs = append(addrs, chunk.Address())
addrsMu.Unlock()
} }
} }
@ -161,7 +170,9 @@ func TestDB_SubscribePush_multiple(t *testing.T) {
if !ok { if !ok {
return return
} }
addrsMu.Lock()
want := addrs[i] want := addrs[i]
addrsMu.Unlock()
var err error var err error
if !bytes.Equal(got.Address(), want) { if !bytes.Equal(got.Address(), want) {
err = fmt.Errorf("got chunk %v address on subscription %v %s, want %s", i, j, got, want) err = fmt.Errorf("got chunk %v address on subscription %v %s, want %s", i, j, got, want)