Skip to content

Commit 47c3cd8

Browse files
send 5 kB of stream data in the handshake drop test
1 parent 192bc8d commit 47c3cd8

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

integrationtests/self/handshake_drop_test.go

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"context"
55
"crypto/tls"
66
"fmt"
7+
"io/ioutil"
78
mrand "math/rand"
89
"net"
910
"sync/atomic"
@@ -31,6 +32,7 @@ var _ = Describe("Handshake drop tests", func() {
3132
ln quic.Listener
3233
)
3334

35+
data := GeneratePRData(5000)
3436
const timeout = 2 * time.Minute
3537

3638
startListenerAndProxy := func(dropCallback quicproxy.DropCallback, doRetry bool, longCertChain bool, version protocol.VersionNumber) {
@@ -77,10 +79,9 @@ var _ = Describe("Handshake drop tests", func() {
7779
defer sess.CloseWithError(0, "")
7880
str, err := sess.AcceptStream(context.Background())
7981
Expect(err).ToNot(HaveOccurred())
80-
b := make([]byte, 6)
81-
_, err = gbytes.TimeoutReader(str, 10*time.Second).Read(b)
82+
b, err := ioutil.ReadAll(gbytes.TimeoutReader(str, timeout))
8283
Expect(err).ToNot(HaveOccurred())
83-
Expect(string(b)).To(Equal("foobar"))
84+
Expect(b).To(Equal(data))
8485
serverSessionChan <- sess
8586
}()
8687
sess, err := quic.DialAddr(
@@ -95,8 +96,9 @@ var _ = Describe("Handshake drop tests", func() {
9596
Expect(err).ToNot(HaveOccurred())
9697
str, err := sess.OpenStream()
9798
Expect(err).ToNot(HaveOccurred())
98-
_, err = str.Write([]byte("foobar"))
99+
_, err = str.Write(data)
99100
Expect(err).ToNot(HaveOccurred())
101+
Expect(str.Close()).To(Succeed())
100102

101103
var serverSession quic.Session
102104
Eventually(serverSessionChan, timeout).Should(Receive(&serverSession))
@@ -115,8 +117,9 @@ var _ = Describe("Handshake drop tests", func() {
115117
Expect(err).ToNot(HaveOccurred())
116118
str, err := sess.OpenStream()
117119
Expect(err).ToNot(HaveOccurred())
118-
_, err = str.Write([]byte("foobar"))
120+
_, err = str.Write(data)
119121
Expect(err).ToNot(HaveOccurred())
122+
Expect(str.Close()).To(Succeed())
120123
serverSessionChan <- sess
121124
}()
122125
sess, err := quic.DialAddr(
@@ -131,10 +134,9 @@ var _ = Describe("Handshake drop tests", func() {
131134
Expect(err).ToNot(HaveOccurred())
132135
str, err := sess.AcceptStream(context.Background())
133136
Expect(err).ToNot(HaveOccurred())
134-
b := make([]byte, 6)
135-
_, err = gbytes.TimeoutReader(str, 10*time.Second).Read(b)
137+
b, err := ioutil.ReadAll(gbytes.TimeoutReader(str, timeout))
136138
Expect(err).ToNot(HaveOccurred())
137-
Expect(string(b)).To(Equal("foobar"))
139+
Expect(b).To(Equal(data))
138140

139141
var serverSession quic.Session
140142
Eventually(serverSessionChan, timeout).Should(Receive(&serverSession))

0 commit comments

Comments
 (0)