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/pss: fix data race in notify_test.go (TestStart)

Browse source 
TestStart failed when all tests were run with race detection.
Simplest way to reproduce:
`go test -race -count 1 -run TestStart ./swarm/pss/notify`

The handler passed to `ctrlClient.Subscribe` is run in a goroutine,
started in `p2p.(*Peer).startProtocols()`. There were 2 problems/races
cased by the handler closure:
1. `t.Fatalf` was called from a goroutine
2. `updateMsg` passed to the handler (reda) was later modified in the
main thread (write)

fixes ethersphere/go-ethereum#1158
This commit is contained in:
Ferenc Szabo 2019-01-24 12:11:52 +01:00
parent dc43ea8d03
commit 6f80218492
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
swarm/pss/notify/notify_test.go
View file

@ -128,7 +128,7 @@ func TestStart(t *testing.T) {
defer rightSub.Unsubscribe()
updateC := make(chan []byte)
updateMsg := []byte{}
var updateMsg []byte
ctrlClient := NewController(psses[rightPub])
ctrlNotifier := NewController(psses[leftPub])
ctrlNotifier.NewNotifier("foo.eth", 2, updateC)
@ -145,17 +145,24 @@ func TestStart(t *testing.T) {
if err != nil {
t.Fatal(err)
}
copyOfUpdateMsg := make([]byte, len(updateMsg))
copy(copyOfUpdateMsg, updateMsg)
ctrlClientError := make(chan error, 1)
ctrlClient.Subscribe(rsrcName, pubkey, addrbytes, func(s string, b []byte) error {
if s != "foo.eth" || !bytes.Equal(updateMsg, b) {
t.Fatalf("unexpected result in client handler: '%s':'%x'", s, b)
if s != "foo.eth" || !bytes.Equal(copyOfUpdateMsg, b) {
ctrlClientError <- fmt.Errorf("unexpected result in client handler: '%s':'%x'", s, b)
} else {
log.Info("client handler receive", "s", s, "b", b)
}
log.Info("client handler receive", "s", s, "b", b)
return nil
})
var inMsg *pss.APIMsg
select {
case inMsg = <-rmsgC:
case err := <-ctrlClientError:
t.Fatal(err)
case <-ctx.Done():
t.Fatal(ctx.Err())
}