@@ -19,11 +19,11 @@ import (
1919 "errors"
2020 "net"
2121 "testing"
22- "time"
2322
2423 "github.com/cloudwego/kitex-tests/kitex_gen/protobuf/grpc_demo/servicea"
2524 "github.com/cloudwego/kitex-tests/pkg/test"
2625 "github.com/cloudwego/kitex-tests/pkg/utils/clientutils"
26+ "github.com/cloudwego/kitex-tests/pkg/utils/serverutils"
2727 client_opt "github.com/cloudwego/kitex/client"
2828 "github.com/cloudwego/kitex/client/callopt"
2929 "github.com/cloudwego/kitex/pkg/endpoint"
@@ -35,15 +35,15 @@ import (
3535)
3636
3737func TestKitexWithoutCompressor (t * testing.T ) {
38- hostport := "localhost:9020"
38+ hostport := serverutils . NextListenAddr ()
3939 addr , _ := net .ResolveTCPAddr ("tcp" , hostport )
4040 svr := servicea .NewServer (new (ServiceAImpl ), server .WithServiceAddr (addr ))
4141 go func () {
4242 err := svr .Run ()
4343 test .Assert (t , err == nil , err )
4444 }()
4545 defer svr .Stop ()
46- time . Sleep ( 50 * time . Millisecond )
46+ serverutils . Wait ( hostport )
4747 client , err := GetClient (hostport )
4848 test .Assert (t , err == nil , err )
4949 defer clientutils .CallClose (client )
@@ -62,15 +62,15 @@ func TestKitexWithoutCompressor(t *testing.T) {
6262}
6363
6464func TestKitexCompressor (t * testing.T ) {
65- hostport := "localhost:9021"
65+ hostport := serverutils . NextListenAddr ()
6666 addr , _ := net .ResolveTCPAddr ("tcp" , hostport )
6767 svr := servicea .NewServer (new (ServiceAImpl ), server .WithServiceAddr (addr ))
6868 go func () {
6969 err := svr .Run ()
7070 test .Assert (t , err == nil , err )
7171 }()
7272 defer svr .Stop ()
73- time . Sleep ( 50 * time . Millisecond )
73+ serverutils . Wait ( hostport )
7474 client , err := GetClient (hostport )
7575 test .Assert (t , err == nil , err )
7676 defer clientutils .CallClose (client )
@@ -90,15 +90,15 @@ func TestKitexCompressor(t *testing.T) {
9090}
9191
9292func TestKitexCompressorWithGRPCClient (t * testing.T ) {
93- hostport := "localhost:9022"
93+ hostport := serverutils . NextListenAddr ()
9494 addr , _ := net .ResolveTCPAddr ("tcp" , hostport )
9595 svr := servicea .NewServer (new (ServiceAImpl ), server .WithServiceAddr (addr ))
9696 go func () {
9797 err := svr .Run ()
9898 test .Assert (t , err == nil , err )
9999 }()
100100 defer svr .Stop ()
101- time . Sleep ( 50 * time . Millisecond )
101+ serverutils . Wait ( hostport )
102102
103103 conn , err := grpc .Dial (hostport , grpc .WithInsecure (), grpc .WithBlock ())
104104 test .Assert (t , err == nil , err )
@@ -136,12 +136,12 @@ func ServiceNameMW(next endpoint.Endpoint) endpoint.Endpoint {
136136}
137137
138138func TestKitexCompressorWithGRPCServer (t * testing.T ) {
139- hostport := "localhost:9023"
139+ hostport := serverutils . NextListenAddr ()
140140 go func () {
141141 err := RunGRPCServer (hostport )
142142 test .Assert (t , err == nil , err )
143143 }()
144- time . Sleep ( 50 * time . Millisecond )
144+ serverutils . Wait ( hostport )
145145
146146 client , err := GetClient (hostport , client_opt .WithMiddleware (ServiceNameMW ))
147147 test .Assert (t , err == nil , err )
0 commit comments