Skip to content

Commit a758bd9

Browse files
authored
server_test.go: wait to run tests until listeners have started (#1411)
Signed-off-by: Joe Lanford <[email protected]>
1 parent 5fb8c1c commit a758bd9

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

pkg/server/server_test.go

+7
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"net"
88
"os"
99
"path/filepath"
10+
"sync"
1011
"testing"
1112
"testing/fstest"
1213
"time"
@@ -142,11 +143,14 @@ func TestMain(m *testing.M) {
142143
}
143144
fbcServerDeprecations := server(fbcDeprecationStore)
144145

146+
var wg sync.WaitGroup
147+
wg.Add(3)
145148
go func() {
146149
lis, err := net.Listen("tcp", dbPort)
147150
if err != nil {
148151
logrus.Fatalf("failed to listen: %v", err)
149152
}
153+
wg.Done()
150154
if err := grpcServer.Serve(lis); err != nil {
151155
logrus.Fatalf("failed to serve db: %v", err)
152156
}
@@ -156,6 +160,7 @@ func TestMain(m *testing.M) {
156160
if err != nil {
157161
logrus.Fatalf("failed to listen: %v", err)
158162
}
163+
wg.Done()
159164
if err := fbcServerSimple.Serve(lis); err != nil {
160165
logrus.Fatalf("failed to serve fbc cache: %v", err)
161166
}
@@ -165,10 +170,12 @@ func TestMain(m *testing.M) {
165170
if err != nil {
166171
logrus.Fatalf("failed to listen: %v", err)
167172
}
173+
wg.Done()
168174
if err := fbcServerDeprecations.Serve(lis); err != nil {
169175
logrus.Fatalf("failed to serve fbc cache: %v", err)
170176
}
171177
}()
178+
wg.Wait()
172179
exit := m.Run()
173180
os.Exit(exit)
174181
}

0 commit comments

Comments
 (0)