From 6c02bd3a30803bd01d077f4720854f2b68ed51ed Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Tue, 25 Feb 2020 14:19:19 +0700 Subject: [PATCH] fix flaky server unit test --- server_test.go | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/server_test.go b/server_test.go index d5fe1403..440be90c 100644 --- a/server_test.go +++ b/server_test.go @@ -806,19 +806,14 @@ var _ = Describe("Server", func() { return sess } - var wg sync.WaitGroup - wg.Add(protocol.MaxAcceptQueueSize) + phm.EXPECT().GetStatelessResetToken(gomock.Any()).Times(protocol.MaxAcceptQueueSize) + phm.EXPECT().Add(gomock.Any(), gomock.Any()).Return(true).Times(2 * protocol.MaxAcceptQueueSize) for i := 0; i < protocol.MaxAcceptQueueSize; i++ { - go func() { - defer GinkgoRecover() - defer wg.Done() - phm.EXPECT().GetStatelessResetToken(gomock.Any()) - phm.EXPECT().Add(gomock.Any(), gomock.Any()).Return(true).Times(2) - serv.handlePacket(getInitialWithRandomDestConnID()) - Consistently(conn.dataWritten).ShouldNot(Receive()) - }() + serv.handlePacket(getInitialWithRandomDestConnID()) } - wg.Wait() + + Eventually(func() int32 { return atomic.LoadInt32(&serv.sessionQueueLen) }).Should(BeEquivalentTo(protocol.MaxAcceptQueueSize)) + Consistently(conn.dataWritten).ShouldNot(Receive()) p := getInitialWithRandomDestConnID() hdr := parseHeader(p.data)