Skip to content

Commit

Permalink
don't call T.Fatal in go routine
Browse files Browse the repository at this point in the history
  • Loading branch information
marten-seemann committed Mar 30, 2021
1 parent 2beae29 commit 09b8a17
Showing 1 changed file with 14 additions and 17 deletions.
31 changes: 14 additions & 17 deletions net/net_test.go
Expand Up @@ -32,10 +32,9 @@ func TestDial(t *testing.T) {
var wg sync.WaitGroup
wg.Add(1)
go func() {

cB, err := listener.Accept()
if err != nil {
t.Fatal("failed to accept")
t.Error("failed to accept")
}

// echo out
Expand Down Expand Up @@ -99,19 +98,19 @@ func TestUnixSockets(t *testing.T) {
go func() {
conn, err := listener.Accept()
if err != nil {
t.Fatal(err)
t.Error(err)
}
defer conn.Close()
buf := make([]byte, 1024)
n, err := conn.Read(buf)
if err != nil {
t.Fatal(err)
t.Error(err)
}
if n != len(payload) {
t.Fatal("failed to read appropriate number of bytes")
t.Error("failed to read appropriate number of bytes")
}
if !bytes.Equal(buf[0:n], payload) {
t.Fatal("payload did not match")
t.Error("payload did not match")
}
done <- struct{}{}
}()
Expand Down Expand Up @@ -146,14 +145,13 @@ func TestListen(t *testing.T) {
var wg sync.WaitGroup
wg.Add(1)
go func() {

cB, err := listener.Accept()
if err != nil {
t.Fatal("failed to accept")
t.Error("failed to accept")
}

if !cB.LocalMultiaddr().Equal(maddr) {
t.Fatal("local multiaddr not equal:", maddr, cB.LocalMultiaddr())
t.Error("local multiaddr not equal:", maddr, cB.LocalMultiaddr())
}

// echo out
Expand Down Expand Up @@ -267,14 +265,13 @@ func TestListenAndDial(t *testing.T) {
var wg sync.WaitGroup
wg.Add(1)
go func() {

cB, err := listener.Accept()
if err != nil {
t.Fatal("failed to accept")
t.Error("failed to accept")
}

if !cB.LocalMultiaddr().Equal(maddr) {
t.Fatal("local multiaddr not equal:", maddr, cB.LocalMultiaddr())
t.Error("local multiaddr not equal:", maddr, cB.LocalMultiaddr())
}

// echo out
Expand Down Expand Up @@ -329,13 +326,13 @@ func TestListenPacketAndDial(t *testing.T) {

go func() {
if !pc.LocalMultiaddr().Equal(maddr) {
t.Fatal("connection multiaddr not equal:", maddr, pc.LocalMultiaddr())
t.Error("connection multiaddr not equal:", maddr, pc.LocalMultiaddr())
}

buffer := make([]byte, 1024)
_, addr, err := pc.ReadFrom(buffer)
if err != nil {
t.Fatal("failed to read into buffer", err)
t.Error("failed to read into buffer", err)
}
pc.WriteTo(buffer, addr)

Expand Down Expand Up @@ -633,16 +630,16 @@ func TestNetListener(t *testing.T) {
go func() {
c, err := Dial(malist.Multiaddr())
if err != nil {
t.Fatal("failed to dial")
t.Error("failed to dial")
}
if !c.RemoteMultiaddr().Equal(malist.Multiaddr()) {
t.Fatal("dialed wrong target")
t.Error("dialed wrong target")
}
c.Close()

c, err = Dial(malist.Multiaddr())
if err != nil {
t.Fatal("failed to dial")
t.Error("failed to dial")
}
c.Close()
}()
Expand Down

0 comments on commit 09b8a17

Please sign in to comment.