Skip to content

Commit b383e39

Browse files
jowayjoway
authored
chore: use 127.0.0.1 and unique port for all test listener (#336)
1 parent c4ec256 commit b383e39

7 files changed

+63
-43
lines changed

‎connection_test.go

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,8 @@ func writeAll(fd int, buf []byte) error {
212212
// Large packet write test. The socket buffer is 2MB by default, here to verify
213213
// whether Connection.Close can be executed normally after socket output buffer is full.
214214
func TestLargeBufferWrite(t *testing.T) {
215-
ln, err := createTestListener("tcp", ":12345")
215+
address := getTestAddress()
216+
ln, err := createTestListener("tcp", address)
216217
MustNil(t, err)
217218

218219
trigger := make(chan int)
@@ -231,7 +232,7 @@ func TestLargeBufferWrite(t *testing.T) {
231232
}
232233
}()
233234

234-
conn, err := DialConnection("tcp", ":12345", time.Second)
235+
conn, err := DialConnection("tcp", address, time.Second)
235236
MustNil(t, err)
236237
rfd := <-trigger
237238

@@ -267,7 +268,8 @@ func TestLargeBufferWrite(t *testing.T) {
267268
}
268269

269270
func TestWriteTimeout(t *testing.T) {
270-
ln, err := createTestListener("tcp", ":1234")
271+
address := getTestAddress()
272+
ln, err := createTestListener("tcp", address)
271273
MustNil(t, err)
272274

273275
interval := time.Millisecond * 100
@@ -296,7 +298,7 @@ func TestWriteTimeout(t *testing.T) {
296298
}
297299
}()
298300

299-
conn, err := DialConnection("tcp", ":1234", time.Second)
301+
conn, err := DialConnection("tcp", address, time.Second)
300302
MustNil(t, err)
301303

302304
_, err = conn.Writer().Malloc(1024)
@@ -440,7 +442,8 @@ func TestBookSizeLargerThanMaxSize(t *testing.T) {
440442
}
441443

442444
func TestConnDetach(t *testing.T) {
443-
ln, err := createTestListener("tcp", ":1234")
445+
address := getTestAddress()
446+
ln, err := createTestListener("tcp", address)
444447
MustNil(t, err)
445448

446449
go func() {
@@ -470,7 +473,7 @@ func TestConnDetach(t *testing.T) {
470473
}
471474
}()
472475

473-
c, err := DialConnection("tcp", ":1234", time.Second)
476+
c, err := DialConnection("tcp", address, time.Second)
474477
MustNil(t, err)
475478

476479
conn := c.(*TCPConnection)
@@ -497,7 +500,8 @@ func TestConnDetach(t *testing.T) {
497500
}
498501

499502
func TestParallelShortConnection(t *testing.T) {
500-
ln, err := createTestListener("tcp", ":12345")
503+
address := getTestAddress()
504+
ln, err := createTestListener("tcp", address)
501505
MustNil(t, err)
502506
defer ln.Close()
503507

@@ -523,7 +527,7 @@ func TestParallelShortConnection(t *testing.T) {
523527
wg.Add(1)
524528
go func() {
525529
defer wg.Done()
526-
conn, err := DialConnection("tcp", ":12345", time.Second)
530+
conn, err := DialConnection("tcp", address, time.Second)
527531
MustNil(t, err)
528532
n, err := conn.Writer().WriteBinary(make([]byte, sizePerConn))
529533
MustNil(t, err)
@@ -546,7 +550,8 @@ func TestParallelShortConnection(t *testing.T) {
546550
}
547551

548552
func TestConnectionServerClose(t *testing.T) {
549-
ln, err := createTestListener("tcp", ":12345")
553+
address := getTestAddress()
554+
ln, err := createTestListener("tcp", address)
550555
MustNil(t, err)
551556
defer ln.Close()
552557

@@ -628,7 +633,7 @@ func TestConnectionServerClose(t *testing.T) {
628633
wg.Add(conns * 6)
629634
for i := 0; i < conns; i++ {
630635
go func() {
631-
conn, err := DialConnection("tcp", ":12345", time.Second)
636+
conn, err := DialConnection("tcp", address, time.Second)
632637
MustNil(t, err)
633638
err = conn.SetOnRequest(clientOnRequest)
634639
MustNil(t, err)
@@ -644,7 +649,8 @@ func TestConnectionServerClose(t *testing.T) {
644649
}
645650

646651
func TestConnectionDailTimeoutAndClose(t *testing.T) {
647-
ln, err := createTestListener("tcp", ":12345")
652+
address := getTestAddress()
653+
ln, err := createTestListener("tcp", address)
648654
MustNil(t, err)
649655
defer ln.Close()
650656

@@ -670,7 +676,7 @@ func TestConnectionDailTimeoutAndClose(t *testing.T) {
670676
for i := 0; i < conns; i++ {
671677
go func() {
672678
defer wg.Done()
673-
conn, err := DialConnection("tcp", ":12345", time.Nanosecond)
679+
conn, err := DialConnection("tcp", address, time.Nanosecond)
674680
Assert(t, err == nil || strings.Contains(err.Error(), "i/o timeout"))
675681
_ = conn
676682
}()

‎mux/shard_queue_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ func TestShardQueue(t *testing.T) {
2929
var svrConn net.Conn
3030
accepted := make(chan struct{})
3131

32-
network, address := "tcp", ":18888"
33-
ln, err := net.Listen("tcp", ":18888")
32+
network, address := "tcp", "localhost:12345"
33+
ln, err := net.Listen("tcp", address)
3434
MustNil(t, err)
3535
stop := make(chan int, 1)
3636
defer close(stop)

‎net_dialer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func (d *dialer) dialTCP(ctx context.Context, network, address string) (connecti
7575
return nil, err
7676
}
7777
var ipaddrs []net.IPAddr
78-
// host maybe empty if address is ":1234"
78+
// host maybe empty if address is :12345
7979
if host == "" {
8080
ipaddrs = []net.IPAddr{{}}
8181
} else {

‎net_dialer_test.go

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,12 @@ import (
3131

3232
func TestDialerTCP(t *testing.T) {
3333
dialer := NewDialer()
34-
conn, err := dialer.DialTimeout("tcp", ":1234", time.Second)
34+
address := getTestAddress()
35+
conn, err := dialer.DialTimeout("tcp", address, time.Second)
3536
MustTrue(t, err != nil)
3637
MustTrue(t, conn.(*TCPConnection) == nil)
3738

38-
ln, err := CreateListener("tcp", ":1234")
39+
ln, err := CreateListener("tcp", address)
3940
MustNil(t, err)
4041

4142
stop := make(chan int, 1)
@@ -57,10 +58,10 @@ func TestDialerTCP(t *testing.T) {
5758
}
5859
}()
5960

60-
conn, err = dialer.DialTimeout("tcp", ":1234", time.Second)
61+
conn, err = dialer.DialTimeout("tcp", address, time.Second)
6162
MustNil(t, err)
6263
MustTrue(t, strings.HasPrefix(conn.LocalAddr().String(), "127.0.0.1:"))
63-
Equal(t, conn.RemoteAddr().String(), "127.0.0.1:1234")
64+
Equal(t, conn.RemoteAddr().String(), address)
6465
}
6566

6667
func TestDialerUnix(t *testing.T) {
@@ -106,7 +107,8 @@ func TestDialerUnix(t *testing.T) {
106107
}
107108

108109
func TestDialerFdAlloc(t *testing.T) {
109-
ln, err := CreateListener("tcp", ":1234")
110+
address := getTestAddress()
111+
ln, err := CreateListener("tcp", address)
110112
MustNil(t, err)
111113
defer ln.Close()
112114
el1, _ := NewEventLoop(func(ctx context.Context, connection Connection) error {
@@ -121,7 +123,7 @@ func TestDialerFdAlloc(t *testing.T) {
121123
defer el1.Shutdown(ctx1)
122124

123125
for i := 0; i < 100; i++ {
124-
conn, err := DialConnection("tcp", ":1234", time.Second)
126+
conn, err := DialConnection("tcp", address, time.Second)
125127
MustNil(t, err)
126128
fd := conn.(*TCPConnection).fd
127129
conn.Write([]byte("hello world"))
@@ -134,7 +136,8 @@ func TestDialerFdAlloc(t *testing.T) {
134136
}
135137

136138
func TestFDClose(t *testing.T) {
137-
ln, err := CreateListener("tcp", ":1234")
139+
address := getTestAddress()
140+
ln, err := CreateListener("tcp", address)
138141
MustNil(t, err)
139142
defer ln.Close()
140143
el1, _ := NewEventLoop(func(ctx context.Context, connection Connection) error {
@@ -150,13 +153,13 @@ func TestFDClose(t *testing.T) {
150153

151154
var fd int
152155
var conn Connection
153-
conn, err = DialConnection("tcp", ":1234", time.Second)
156+
conn, err = DialConnection("tcp", address, time.Second)
154157
MustNil(t, err)
155158
fd = conn.(*TCPConnection).fd
156159
syscall.SetNonblock(fd, true)
157160
conn.Close()
158161

159-
conn, err = DialConnection("tcp", ":1234", time.Second)
162+
conn, err = DialConnection("tcp", address, time.Second)
160163
MustNil(t, err)
161164
fd = conn.(*TCPConnection).fd
162165
syscall.SetNonblock(fd, true)
@@ -166,8 +169,10 @@ func TestFDClose(t *testing.T) {
166169

167170
// fd data package race test, use two servers and two dialers.
168171
func TestDialerThenClose(t *testing.T) {
172+
address1 := getTestAddress()
173+
address2 := getTestAddress()
169174
// server 1
170-
ln1, _ := createTestListener("tcp", ":1231")
175+
ln1, _ := createTestListener("tcp", address1)
171176
el1 := mockDialerEventLoop(1)
172177
go func() {
173178
el1.Serve(ln1)
@@ -177,7 +182,7 @@ func TestDialerThenClose(t *testing.T) {
177182
defer el1.Shutdown(ctx1)
178183

179184
// server 2
180-
ln2, _ := createTestListener("tcp", ":1232")
185+
ln2, _ := createTestListener("tcp", address2)
181186
el2 := mockDialerEventLoop(2)
182187
go func() {
183188
el2.Serve(ln2)
@@ -194,12 +199,12 @@ func TestDialerThenClose(t *testing.T) {
194199
defer wg.Done()
195200
for i := 0; i < 50; i++ {
196201
// send server 1
197-
conn, err := DialConnection("tcp", ":1231", time.Second)
202+
conn, err := DialConnection("tcp", address1, time.Second)
198203
if err == nil {
199204
mockDialerSend(1, &conn.(*TCPConnection).connection)
200205
}
201206
// send server 2
202-
conn, err = DialConnection("tcp", ":1232", time.Second)
207+
conn, err = DialConnection("tcp", address2, time.Second)
203208
if err == nil {
204209
mockDialerSend(2, &conn.(*TCPConnection).connection)
205210
}

‎net_listener_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727

2828
func TestListenerDialer(t *testing.T) {
2929
network := "tcp"
30-
addr := ":1234"
30+
addr := getTestAddress()
3131
ln, err := CreateListener(network, addr)
3232
MustNil(t, err)
3333
defer ln.Close()

‎net_polldesc_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ func TestZeroTimer(t *testing.T) {
2727
}
2828

2929
func TestRuntimePoll(t *testing.T) {
30-
ln, err := CreateListener("tcp", ":1234")
30+
address := getTestAddress()
31+
ln, err := CreateListener("tcp", address)
3132
MustNil(t, err)
3233

3334
stop := make(chan int, 1)
@@ -50,7 +51,7 @@ func TestRuntimePoll(t *testing.T) {
5051
}()
5152

5253
for i := 0; i < 10; i++ {
53-
conn, err := DialConnection("tcp", ":1234", time.Second)
54+
conn, err := DialConnection("tcp", address, time.Second)
5455
MustNil(t, err)
5556
conn.Close()
5657
}

0 commit comments

Comments
 (0)