From 8e7a4fe13f7ccffeea34a04698ff747b093d24d7 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Wed, 20 Jan 2021 12:38:41 +0800 Subject: [PATCH] fix flaky stream cancelation integration test --- integrationtests/self/cancelation_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/integrationtests/self/cancelation_test.go b/integrationtests/self/cancelation_test.go index 6280236a..a069243f 100644 --- a/integrationtests/self/cancelation_test.go +++ b/integrationtests/self/cancelation_test.go @@ -347,10 +347,11 @@ var _ = Describe("Stream Cancelations", func() { done := make(chan struct{}) go func() { defer GinkgoRecover() - var wg sync.WaitGroup - wg.Add(numStreams) + defer close(done) sess, err := server.Accept(context.Background()) Expect(err).ToNot(HaveOccurred()) + var wg sync.WaitGroup + wg.Add(numStreams) for i := 0; i < numStreams; i++ { go func() { defer GinkgoRecover() @@ -375,7 +376,6 @@ var _ = Describe("Stream Cancelations", func() { }() } wg.Wait() - close(done) }() sess, err := quic.DialAddr( @@ -419,13 +419,13 @@ var _ = Describe("Stream Cancelations", func() { }() } wg.Wait() + Eventually(done).Should(BeClosed()) count := atomic.LoadInt32(&counter) Expect(count).To(BeNumerically(">", numStreams/15)) fmt.Fprintf(GinkgoWriter, "Successfully read from %d of %d streams.\n", count, numStreams) Expect(sess.CloseWithError(0, "")).To(Succeed()) - Eventually(done).Should(BeClosed()) Expect(server.Close()).To(Succeed()) }) })