diff options
author | Janoš Guljaš <janos@users.noreply.github.com> | 2019-01-09 14:05:55 +0800 |
---|---|---|
committer | Viktor Trón <viktor.tron@gmail.com> | 2019-01-09 14:05:55 +0800 |
commit | d70c4faf20d5533e30eec5cbb9b5180eb837b78c (patch) | |
tree | b059c20fa8093b6f8479a7706077cc24cdcaba0e /swarm/network/simulation/events_test.go | |
parent | 81f04fa60608a67bac693879acbe086562d3970d (diff) | |
download | go-tangerine-d70c4faf20d5533e30eec5cbb9b5180eb837b78c.tar go-tangerine-d70c4faf20d5533e30eec5cbb9b5180eb837b78c.tar.gz go-tangerine-d70c4faf20d5533e30eec5cbb9b5180eb837b78c.tar.bz2 go-tangerine-d70c4faf20d5533e30eec5cbb9b5180eb837b78c.tar.lz go-tangerine-d70c4faf20d5533e30eec5cbb9b5180eb837b78c.tar.xz go-tangerine-d70c4faf20d5533e30eec5cbb9b5180eb837b78c.tar.zst go-tangerine-d70c4faf20d5533e30eec5cbb9b5180eb837b78c.zip |
swarm: Fix T.Fatal inside a goroutine in tests (#18409)
* swarm/storage: fix T.Fatal inside a goroutine
* swarm/network/simulation: fix T.Fatal inside a goroutine
* swarm/network/stream: fix T.Fatal inside a goroutine
* swarm/network/simulation: consistent failures in TestPeerEventsTimeout
* swarm/network/simulation: rename sendRunSignal to triggerSimulationRun
Diffstat (limited to 'swarm/network/simulation/events_test.go')
-rw-r--r-- | swarm/network/simulation/events_test.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/swarm/network/simulation/events_test.go b/swarm/network/simulation/events_test.go index 34ef24ed4..529844816 100644 --- a/swarm/network/simulation/events_test.go +++ b/swarm/network/simulation/events_test.go @@ -81,6 +81,7 @@ func TestPeerEventsTimeout(t *testing.T) { events := sim.PeerEvents(ctx, sim.NodeIDs()) done := make(chan struct{}) + errC := make(chan error) go func() { for e := range events { if e.Error == context.Canceled { @@ -90,14 +91,16 @@ func TestPeerEventsTimeout(t *testing.T) { close(done) return } else { - t.Fatal(e.Error) + errC <- e.Error } } }() select { case <-time.After(time.Second): - t.Error("no context deadline received") + t.Fatal("no context deadline received") + case err := <-errC: + t.Fatal(err) case <-done: // all good, context deadline detected } |