gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

Merge pull request #1987 from lucas-clemente/fix-flaky-session-resumption-test

Browse Source 
fix flaky session resumption integration test
This commit is contained in:
Marten Seemann
2019-07-05 20:41:41 +07:00
committed by GitHub
parent 9cbfcd19a1 35497737c8
commit c9a436bab7
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
integrationtests/self/resumption_test.go
View File

@@ -52,19 +52,6 @@ var _ = Describe("TLS session resumption", func() {
Expect(err).ToNot(HaveOccurred())
defer server.Close()
done := make(chan struct{})
go func() {
defer close(done)
defer GinkgoRecover()
sess, err := server.Accept(context.Background())
Expect(err).ToNot(HaveOccurred())
Expect(sess.ConnectionState().DidResume).To(BeFalse())
sess, err = server.Accept(context.Background())
Expect(err).ToNot(HaveOccurred())
Expect(sess.ConnectionState().DidResume).To(BeTrue())
}()
gets := make(chan string, 100)
puts := make(chan string, 100)
cache := newClientSessionCache(gets, puts)
@@ -80,6 +67,10 @@ var _ = Describe("TLS session resumption", func() {
Eventually(puts).Should(Receive(&sessionKey))
Expect(sess.ConnectionState().DidResume).To(BeFalse())
serverSess, err := server.Accept(context.Background())
Expect(err).ToNot(HaveOccurred())
Expect(serverSess.ConnectionState().DidResume).To(BeFalse())
sess, err = quic.DialAddr(
fmt.Sprintf("localhost:%d", server.Addr().(*net.UDPAddr).Port),
tlsConf,
@@ -89,6 +80,8 @@ var _ = Describe("TLS session resumption", func() {
Expect(gets).To(Receive(Equal(sessionKey)))
Expect(sess.ConnectionState().DidResume).To(BeTrue())
Eventually(done).Should(BeClosed())
serverSess, err = server.Accept(context.Background())
Expect(err).ToNot(HaveOccurred())
Expect(serverSess.ConnectionState().DidResume).To(BeTrue())
})
})