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

swarm/pss: fix data race in notify_test.go (TestStart) (#18518)

Browse Source
This commit is contained in:
Ferenc Szabo 2019-01-24 17:07:43 +01:00 committed by Anton Evangelatov
parent 684facedb8
commit 6167dd65b5
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() defer rightSub.Unsubscribe()
updateC := make(chan []byte) updateC := make(chan []byte)
updateMsg := []byte{} var updateMsg []byte
ctrlClient := NewController(psses[rightPub]) ctrlClient := NewController(psses[rightPub])
ctrlNotifier := NewController(psses[leftPub]) ctrlNotifier := NewController(psses[leftPub])
ctrlNotifier.NewNotifier("foo.eth", 2, updateC) ctrlNotifier.NewNotifier("foo.eth", 2, updateC)
@ -145,17 +145,24 @@ func TestStart(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) 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 { ctrlClient.Subscribe(rsrcName, pubkey, addrbytes, func(s string, b []byte) error {
if s != "foo.eth" || !bytes.Equal(updateMsg, b) { if s != "foo.eth" || !bytes.Equal(copyOfUpdateMsg, b) {
t.Fatalf("unexpected result in client handler: '%s':'%x'", s, 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 return nil
}) })
var inMsg *pss.APIMsg var inMsg *pss.APIMsg
select { select {
case inMsg = <-rmsgC: case inMsg = <-rmsgC:
case err := <-ctrlClientError:
t.Fatal(err)
case <-ctx.Done(): case <-ctx.Done():
t.Fatal(ctx.Err()) t.Fatal(ctx.Err())
} }