split the Session.Close(error) in Close() and CloseWithError(error)

This commit is contained in:
Marten Seemann
2018-07-04 17:04:50 +07:00
parent 2bc5b7f532
commit 8b2992a243
22 changed files with 168 additions and 105 deletions

View File

@@ -52,7 +52,7 @@ var _ = Describe("Connection ID lengths tests", func() {
conf,
)
Expect(err).ToNot(HaveOccurred())
defer cl.Close(nil)
defer cl.Close()
str, err := cl.AcceptStream()
Expect(err).ToNot(HaveOccurred())
data, err := ioutil.ReadAll(str)

View File

@@ -61,7 +61,7 @@ var _ = Describe("Handshake drop tests", func() {
defer GinkgoRecover()
sess, err := ln.Accept()
Expect(err).ToNot(HaveOccurred())
defer sess.Close(nil)
defer sess.Close()
str, err := sess.AcceptStream()
Expect(err).ToNot(HaveOccurred())
b := make([]byte, 6)
@@ -83,8 +83,8 @@ var _ = Describe("Handshake drop tests", func() {
var serverSession quic.Session
Eventually(serverSessionChan, 10*time.Second).Should(Receive(&serverSession))
sess.Close(nil)
serverSession.Close(nil)
sess.Close()
serverSession.Close()
},
}
@@ -117,8 +117,8 @@ var _ = Describe("Handshake drop tests", func() {
var serverSession quic.Session
Eventually(serverSessionChan, 10*time.Second).Should(Receive(&serverSession))
sess.Close(nil)
serverSession.Close(nil)
sess.Close()
serverSession.Close()
},
}
@@ -141,8 +141,8 @@ var _ = Describe("Handshake drop tests", func() {
var serverSession quic.Session
Eventually(serverSessionChan, 10*time.Second).Should(Receive(&serverSession))
// both server and client accepted a session. Close now.
sess.Close(nil)
serverSession.Close(nil)
sess.Close()
serverSession.Close()
},
}

View File

@@ -74,7 +74,7 @@ var _ = Describe("non-zero RTT", func() {
data, err := ioutil.ReadAll(str)
Expect(err).ToNot(HaveOccurred())
Expect(data).To(Equal(testserver.PRData))
sess.Close(nil)
sess.Close()
Eventually(done).Should(BeClosed())
})
}

View File

@@ -109,7 +109,7 @@ var _ = Describe("Bidirectional streams", func() {
sess, err := server.Accept()
Expect(err).ToNot(HaveOccurred())
runSendingPeer(sess)
sess.Close(nil)
sess.Close()
}()
client, err := quic.DialAddr(serverAddr, nil, qconf)

View File

@@ -78,7 +78,7 @@ var _ = Describe("Unidirectional Streams", func() {
sess, err = server.Accept()
Expect(err).ToNot(HaveOccurred())
runReceivingPeer(sess)
sess.Close(nil)
sess.Close()
}()
client, err := quic.DialAddr(serverAddr, nil, qconf)