use the HandshakeComplete() context for accepting sessions in the server

This commit is contained in:
Marten Seemann
2019-07-06 17:37:15 +07:00
parent 3724f91f33
commit b06d7b0cba
8 changed files with 70 additions and 107 deletions

View File

@@ -1154,7 +1154,6 @@ var _ = Describe("Session", func() {
})
It("cancels the HandshakeComplete context when the handshake completes", func() {
sessionRunner.EXPECT().OnHandshakeComplete(gomock.Any())
packer.EXPECT().PackPacket().AnyTimes()
finishHandshake := make(chan struct{})
go func() {
@@ -1197,17 +1196,14 @@ var _ = Describe("Session", func() {
It("sends a 1-RTT packet when the handshake completes", func() {
done := make(chan struct{})
gomock.InOrder(
sessionRunner.EXPECT().OnHandshakeComplete(gomock.Any()),
packer.EXPECT().PackPacket().DoAndReturn(func() (*packedPacket, error) {
defer close(done)
return &packedPacket{
header: &wire.ExtendedHeader{},
buffer: getPacketBuffer(),
}, nil
}),
packer.EXPECT().PackPacket().AnyTimes(),
)
packer.EXPECT().PackPacket().DoAndReturn(func() (*packedPacket, error) {
defer close(done)
return &packedPacket{
header: &wire.ExtendedHeader{},
buffer: getPacketBuffer(),
}, nil
})
packer.EXPECT().PackPacket().AnyTimes()
go func() {
defer GinkgoRecover()
cryptoSetup.EXPECT().RunHandshake()
@@ -1451,7 +1447,6 @@ var _ = Describe("Session", func() {
done := make(chan struct{})
go func() {
defer GinkgoRecover()
sessionRunner.EXPECT().OnHandshakeComplete(sess)
cryptoSetup.EXPECT().RunHandshake()
close(sess.handshakeCompleteChan)
err := sess.run()