From 827b3c6f5de8dc2e24e3c03aac2182be0b876eff Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Fri, 2 Feb 2018 09:18:03 +0800 Subject: [PATCH] fix flaky pacing test on CIs --- session_test.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/session_test.go b/session_test.go index 749c5b0d4..72d83901f 100644 --- a/session_test.go +++ b/session_test.go @@ -758,10 +758,11 @@ var _ = Describe("Session", func() { }) It("paces packets", func() { - sess.queueControlFrame(&wire.MaxDataFrame{ByteOffset: 1}) + pacingDelay := scaleDuration(100 * time.Millisecond) + sess.packer.QueueControlFrame(&wire.MaxDataFrame{ByteOffset: 1}) sph.EXPECT().SentPacket(gomock.Any()).Times(2) - sph.EXPECT().TimeUntilSend().Return(time.Now().Add(-time.Minute)) - sph.EXPECT().TimeUntilSend().Return(time.Now().Add(300 * time.Millisecond)) + sph.EXPECT().TimeUntilSend().Return(time.Now().Add(-time.Minute)) // send one packet immediately + sph.EXPECT().TimeUntilSend().Return(time.Now().Add(pacingDelay)) // send one sph.EXPECT().TimeUntilSend().Return(time.Now().Add(time.Hour)) sph.EXPECT().ShouldSendNumPackets().Times(2).Return(1) sph.EXPECT().SendingAllowed().Do(func() { // after sending the first packet @@ -776,8 +777,8 @@ var _ = Describe("Session", func() { }() sess.scheduleSending() Eventually(mconn.written).Should(HaveLen(1)) - Consistently(mconn.written, 100*time.Millisecond).Should(HaveLen(1)) - Eventually(mconn.written).Should(HaveLen(2)) + Consistently(mconn.written, pacingDelay/2).Should(HaveLen(1)) + Eventually(mconn.written, 2*pacingDelay).Should(HaveLen(2)) // make the go routine return sess.Close(nil) Eventually(done).Should(BeClosed())