Skip to content

Commit ff7b6a7

Browse files
don't call T.Fatal in go routine
1 parent 7c39c5c commit ff7b6a7

File tree

1 file changed

+14
-17
lines changed

1 file changed

+14
-17
lines changed

net/net_test.go

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,9 @@ func TestDial(t *testing.T) {
3232
var wg sync.WaitGroup
3333
wg.Add(1)
3434
go func() {
35-
3635
cB, err := listener.Accept()
3736
if err != nil {
38-
t.Fatal("failed to accept")
37+
t.Error("failed to accept")
3938
}
4039

4140
// echo out
@@ -99,19 +98,19 @@ func TestUnixSockets(t *testing.T) {
9998
go func() {
10099
conn, err := listener.Accept()
101100
if err != nil {
102-
t.Fatal(err)
101+
t.Error(err)
103102
}
104103
defer conn.Close()
105104
buf := make([]byte, 1024)
106105
n, err := conn.Read(buf)
107106
if err != nil {
108-
t.Fatal(err)
107+
t.Error(err)
109108
}
110109
if n != len(payload) {
111-
t.Fatal("failed to read appropriate number of bytes")
110+
t.Error("failed to read appropriate number of bytes")
112111
}
113112
if !bytes.Equal(buf[0:n], payload) {
114-
t.Fatal("payload did not match")
113+
t.Error("payload did not match")
115114
}
116115
done <- struct{}{}
117116
}()
@@ -146,14 +145,13 @@ func TestListen(t *testing.T) {
146145
var wg sync.WaitGroup
147146
wg.Add(1)
148147
go func() {
149-
150148
cB, err := listener.Accept()
151149
if err != nil {
152-
t.Fatal("failed to accept")
150+
t.Error("failed to accept")
153151
}
154152

155153
if !cB.LocalMultiaddr().Equal(maddr) {
156-
t.Fatal("local multiaddr not equal:", maddr, cB.LocalMultiaddr())
154+
t.Error("local multiaddr not equal:", maddr, cB.LocalMultiaddr())
157155
}
158156

159157
// echo out
@@ -267,14 +265,13 @@ func TestListenAndDial(t *testing.T) {
267265
var wg sync.WaitGroup
268266
wg.Add(1)
269267
go func() {
270-
271268
cB, err := listener.Accept()
272269
if err != nil {
273-
t.Fatal("failed to accept")
270+
t.Error("failed to accept")
274271
}
275272

276273
if !cB.LocalMultiaddr().Equal(maddr) {
277-
t.Fatal("local multiaddr not equal:", maddr, cB.LocalMultiaddr())
274+
t.Error("local multiaddr not equal:", maddr, cB.LocalMultiaddr())
278275
}
279276

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

330327
go func() {
331328
if !pc.LocalMultiaddr().Equal(maddr) {
332-
t.Fatal("connection multiaddr not equal:", maddr, pc.LocalMultiaddr())
329+
t.Error("connection multiaddr not equal:", maddr, pc.LocalMultiaddr())
333330
}
334331

335332
buffer := make([]byte, 1024)
336333
_, addr, err := pc.ReadFrom(buffer)
337334
if err != nil {
338-
t.Fatal("failed to read into buffer", err)
335+
t.Error("failed to read into buffer", err)
339336
}
340337
pc.WriteTo(buffer, addr)
341338

@@ -633,16 +630,16 @@ func TestNetListener(t *testing.T) {
633630
go func() {
634631
c, err := Dial(malist.Multiaddr())
635632
if err != nil {
636-
t.Fatal("failed to dial")
633+
t.Error("failed to dial")
637634
}
638635
if !c.RemoteMultiaddr().Equal(malist.Multiaddr()) {
639-
t.Fatal("dialed wrong target")
636+
t.Error("dialed wrong target")
640637
}
641638
c.Close()
642639

643640
c, err = Dial(malist.Multiaddr())
644641
if err != nil {
645-
t.Fatal("failed to dial")
642+
t.Error("failed to dial")
646643
}
647644
c.Close()
648645
}()

0 commit comments

Comments
 (0)