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

Merge pull request #3247 from lucas-clemente/drop-go-115

Browse Source 
drop support for Go 1.15
This commit is contained in:
Marten Seemann
2021-08-05 19:50:30 +02:00
committed by GitHub
parent 346bd63a60 68e468a3bc
commit 8ecbb05d44
30 changed files with 93 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
integrationtests/self/cancelation_test.go
View File

@@ -4,7 +4,6 @@ import (
"context"
"fmt"
"io"
"io/ioutil"
"math/rand"
"net"
"sync"
@@ -94,7 +93,7 @@ var _ = Describe("Stream Cancelations", func() {
str.CancelRead(quic.StreamErrorCode(str.StreamID()))
return
}
data, err := ioutil.ReadAll(str)
data, err := io.ReadAll(str)
Expect(err).ToNot(HaveOccurred())
Expect(data).To(Equal(PRData))
}()
@@ -135,14 +134,14 @@ var _ = Describe("Stream Cancelations", func() {
// only read some data from about 1/3 of the streams
if rand.Int31()%3 != 0 {
length := int(rand.Int31n(int32(len(PRData) - 1)))
data, err := ioutil.ReadAll(io.LimitReader(str, int64(length)))
data, err := io.ReadAll(io.LimitReader(str, int64(length)))
Expect(err).ToNot(HaveOccurred())
str.CancelRead(quic.StreamErrorCode(str.StreamID()))
Expect(data).To(Equal(PRData[:length]))
atomic.AddInt32(&canceledCounter, 1)
return
}
data, err := ioutil.ReadAll(str)
data, err := io.ReadAll(str)
Expect(err).ToNot(HaveOccurred())
Expect(data).To(Equal(PRData))
}()
@@ -225,7 +224,7 @@ var _ = Describe("Stream Cancelations", func() {
defer wg.Done()
str, err := sess.AcceptUniStream(context.Background())
Expect(err).ToNot(HaveOccurred())
data, err := ioutil.ReadAll(str)
data, err := io.ReadAll(str)
if err != nil {
atomic.AddInt32(&counter, 1)
Expect(err).To(MatchError(&quic.StreamError{
@@ -375,7 +374,7 @@ var _ = Describe("Stream Cancelations", func() {
str.CancelRead(quic.StreamErrorCode(str.StreamID()))
return
}
data, err := ioutil.ReadAll(str)
data, err := io.ReadAll(str)
if err != nil {
Expect(err).To(MatchError(&quic.StreamError{
StreamID: str.StreamID(),
@@ -464,7 +463,7 @@ var _ = Describe("Stream Cancelations", func() {
length = int(rand.Int31n(int32(len(PRData) - 1)))
r = io.LimitReader(str, int64(length))
}
data, err := ioutil.ReadAll(r)
data, err := io.ReadAll(r)
if err != nil {
Expect(err).To(MatchError(&quic.StreamError{
StreamID: str.StreamID(),
@@ -547,7 +546,7 @@ var _ = Describe("Stream Cancelations", func() {
}
return
}
data, err := ioutil.ReadAll(str)
data, err := io.ReadAll(str)
Expect(err).ToNot(HaveOccurred())
Expect(data).To(Equal(PRData))
wg.Done()
@@ -617,7 +616,7 @@ var _ = Describe("Stream Cancelations", func() {
Expect(err).ToNot(HaveOccurred())
go func(str quic.ReceiveStream) {
defer GinkgoRecover()
data, err := ioutil.ReadAll(str)
data, err := io.ReadAll(str)
Expect(err).ToNot(HaveOccurred())
Expect(data).To(Equal(PRData))
wg.Done()

4
integrationtests/self/conn_id_test.go
View File

@@ -3,7 +3,7 @@ package self_test
import (
"context"
"fmt"
"io/ioutil"
"io"
"math/rand"
"net"
@@ -54,7 +54,7 @@ var _ = Describe("Connection ID lengths tests", func() {
defer cl.CloseWithError(0, "")
str, err := cl.AcceptStream(context.Background())
Expect(err).ToNot(HaveOccurred())
data, err := ioutil.ReadAll(str)
data, err := io.ReadAll(str)
Expect(err).ToNot(HaveOccurred())
Expect(data).To(Equal(PRData))
}

6
integrationtests/self/deadline_test.go
View File

@@ -3,7 +3,7 @@ package self_test
import (
"context"
"fmt"
"io/ioutil"
"io"
"net"
"time"
@@ -138,7 +138,7 @@ var _ = Describe("Stream deadline tests", func() {
done := make(chan struct{})
go func() {
defer GinkgoRecover()
data, err := ioutil.ReadAll(serverStr)
data, err := io.ReadAll(serverStr)
Expect(err).ToNot(HaveOccurred())
Expect(data).To(Equal(PRDataLong))
close(done)
@@ -171,7 +171,7 @@ var _ = Describe("Stream deadline tests", func() {
readDone := make(chan struct{})
go func() {
defer GinkgoRecover()
data, err := ioutil.ReadAll(serverStr)
data, err := io.ReadAll(serverStr)
Expect(err).ToNot(HaveOccurred())
Expect(data).To(Equal(PRDataLong))
close(readDone)

4
integrationtests/self/early_data_test.go
View File

@@ -3,7 +3,7 @@ package self_test
import (
"context"
"fmt"
"io/ioutil"
"io"
"net"
"time"
@@ -61,7 +61,7 @@ var _ = Describe("early data", func() {
Expect(err).ToNot(HaveOccurred())
str, err := sess.AcceptUniStream(context.Background())
Expect(err).ToNot(HaveOccurred())
data, err := ioutil.ReadAll(str)
data, err := io.ReadAll(str)
Expect(err).ToNot(HaveOccurred())
Expect(data).To(Equal([]byte("early data")))
sess.CloseWithError(0, "")

6
integrationtests/self/handshake_drop_test.go
View File

@@ -4,7 +4,7 @@ import (
"context"
"crypto/tls"
"fmt"
"io/ioutil"
"io"
mrand "math/rand"
"net"
"sync/atomic"
@@ -79,7 +79,7 @@ var _ = Describe("Handshake drop tests", func() {
defer sess.CloseWithError(0, "")
str, err := sess.AcceptStream(context.Background())
Expect(err).ToNot(HaveOccurred())
b, err := ioutil.ReadAll(gbytes.TimeoutReader(str, timeout))
b, err := io.ReadAll(gbytes.TimeoutReader(str, timeout))
Expect(err).ToNot(HaveOccurred())
Expect(b).To(Equal(data))
serverSessionChan <- sess
@@ -134,7 +134,7 @@ var _ = Describe("Handshake drop tests", func() {
Expect(err).ToNot(HaveOccurred())
str, err := sess.AcceptStream(context.Background())
Expect(err).ToNot(HaveOccurred())
b, err := ioutil.ReadAll(gbytes.TimeoutReader(str, timeout))
b, err := io.ReadAll(gbytes.TimeoutReader(str, timeout))
Expect(err).ToNot(HaveOccurred())
Expect(b).To(Equal(data))

4
integrationtests/self/handshake_test.go
View File

@@ -5,7 +5,7 @@ import (
"crypto/tls"
"errors"
"fmt"
"io/ioutil"
"io"
"net"
"time"
@@ -216,7 +216,7 @@ var _ = Describe("Handshake tests", func() {
Expect(err).ToNot(HaveOccurred())
str, err := sess.AcceptStream(context.Background())
Expect(err).ToNot(HaveOccurred())
data, err := ioutil.ReadAll(str)
data, err := io.ReadAll(str)
Expect(err).ToNot(HaveOccurred())
Expect(data).To(Equal(PRData))
Expect(sess.ConnectionState().TLS.CipherSuite).To(Equal(suiteID))

17
integrationtests/self/http_test.go
View File

@@ -9,7 +9,6 @@ import (
"errors"
"fmt"
"io"
"io/ioutil"
"net"
"net/http"
"strconv"
@@ -63,7 +62,7 @@ var _ = Describe("HTTP tests", func() {
mux.HandleFunc("/echo", func(w http.ResponseWriter, r *http.Request) {
defer GinkgoRecover()
body, err := ioutil.ReadAll(r.Body)
body, err := io.ReadAll(r.Body)
Expect(err).NotTo(HaveOccurred())
w.Write(body) // don't check the error here. Stream may be reset.
})
@@ -119,7 +118,7 @@ var _ = Describe("HTTP tests", func() {
resp, err := client.Get("https://localhost:" + port + "/hello")
Expect(err).ToNot(HaveOccurred())
Expect(resp.StatusCode).To(Equal(200))
body, err := ioutil.ReadAll(gbytes.TimeoutReader(resp.Body, 3*time.Second))
body, err := io.ReadAll(gbytes.TimeoutReader(resp.Body, 3*time.Second))
Expect(err).ToNot(HaveOccurred())
Expect(string(body)).To(Equal("Hello, World!\n"))
})
@@ -161,7 +160,7 @@ var _ = Describe("HTTP tests", func() {
resp, err := client.Get("https://localhost:" + port + "/prdata")
Expect(err).ToNot(HaveOccurred())
Expect(resp.StatusCode).To(Equal(200))
body, err := ioutil.ReadAll(gbytes.TimeoutReader(resp.Body, 5*time.Second))
body, err := io.ReadAll(gbytes.TimeoutReader(resp.Body, 5*time.Second))
Expect(err).ToNot(HaveOccurred())
Expect(body).To(Equal(PRData))
})
@@ -170,7 +169,7 @@ var _ = Describe("HTTP tests", func() {
resp, err := client.Get("https://localhost:" + port + "/prdatalong")
Expect(err).ToNot(HaveOccurred())
Expect(resp.StatusCode).To(Equal(200))
body, err := ioutil.ReadAll(gbytes.TimeoutReader(resp.Body, 20*time.Second))
body, err := io.ReadAll(gbytes.TimeoutReader(resp.Body, 20*time.Second))
Expect(err).ToNot(HaveOccurred())
Expect(body).To(Equal(PRDataLong))
})
@@ -182,7 +181,7 @@ var _ = Describe("HTTP tests", func() {
resp, err := client.Get("https://localhost:" + port + "/hello")
Expect(err).ToNot(HaveOccurred())
Expect(resp.StatusCode).To(Equal(200))
body, err := ioutil.ReadAll(gbytes.TimeoutReader(resp.Body, 3*time.Second))
body, err := io.ReadAll(gbytes.TimeoutReader(resp.Body, 3*time.Second))
Expect(err).ToNot(HaveOccurred())
Expect(string(body)).To(Equal("Hello, World!\n"))
}
@@ -207,7 +206,7 @@ var _ = Describe("HTTP tests", func() {
)
Expect(err).ToNot(HaveOccurred())
Expect(resp.StatusCode).To(Equal(200))
body, err := ioutil.ReadAll(gbytes.TimeoutReader(resp.Body, 5*time.Second))
body, err := io.ReadAll(gbytes.TimeoutReader(resp.Body, 5*time.Second))
Expect(err).ToNot(HaveOccurred())
Expect(body).To(Equal([]byte("Hello, world!")))
})
@@ -220,7 +219,7 @@ var _ = Describe("HTTP tests", func() {
)
Expect(err).ToNot(HaveOccurred())
Expect(resp.StatusCode).To(Equal(200))
body, err := ioutil.ReadAll(gbytes.TimeoutReader(resp.Body, 5*time.Second))
body, err := io.ReadAll(gbytes.TimeoutReader(resp.Body, 5*time.Second))
Expect(err).ToNot(HaveOccurred())
Expect(body).To(Equal(PRData))
})
@@ -243,7 +242,7 @@ var _ = Describe("HTTP tests", func() {
Expect(resp.StatusCode).To(Equal(200))
Expect(resp.Uncompressed).To(BeTrue())
body, err := ioutil.ReadAll(gbytes.TimeoutReader(resp.Body, 3*time.Second))
body, err := io.ReadAll(gbytes.TimeoutReader(resp.Body, 3*time.Second))
Expect(err).ToNot(HaveOccurred())
Expect(string(body)).To(Equal("Hello, World!\n"))
})

4
integrationtests/self/key_update_test.go
View File

@@ -3,7 +3,7 @@ package self_test
import (
"context"
"fmt"
"io/ioutil"
"io"
"net"
quic "github.com/lucas-clemente/quic-go"
@@ -90,7 +90,7 @@ var _ = Describe("Key Update tests", func() {
Expect(err).ToNot(HaveOccurred())
str, err := sess.AcceptUniStream(context.Background())
Expect(err).ToNot(HaveOccurred())
data, err := ioutil.ReadAll(str)
data, err := io.ReadAll(str)
Expect(err).ToNot(HaveOccurred())
Expect(data).To(Equal(PRDataLong))
Expect(sess.CloseWithError(0, "")).To(Succeed())

6
integrationtests/self/mitm_test.go
View File

@@ -5,7 +5,7 @@ import (
"context"
"errors"
"fmt"
"io/ioutil"
"io"
"math"
mrand "math/rand"
"net"
@@ -136,7 +136,7 @@ var _ = Describe("MITM test", func() {
Expect(err).ToNot(HaveOccurred())
str, err := sess.AcceptUniStream(context.Background())
Expect(err).ToNot(HaveOccurred())
data, err := ioutil.ReadAll(str)
data, err := io.ReadAll(str)
Expect(err).ToNot(HaveOccurred())
Expect(data).To(Equal(PRData))
Expect(sess.CloseWithError(0, "")).To(Succeed())
@@ -182,7 +182,7 @@ var _ = Describe("MITM test", func() {
Expect(err).ToNot(HaveOccurred())
str, err := sess.AcceptUniStream(context.Background())
Expect(err).ToNot(HaveOccurred())
data, err := ioutil.ReadAll(str)
data, err := io.ReadAll(str)
Expect(err).ToNot(HaveOccurred())
Expect(data).To(Equal(PRData))
Expect(sess.CloseWithError(0, "")).To(Succeed())

4
integrationtests/self/multiplex_test.go
View File

@@ -3,7 +3,7 @@ package self_test
import (
"context"
"fmt"
"io/ioutil"
"io"
"net"
"runtime"
"time"
@@ -52,7 +52,7 @@ var _ = Describe("Multiplexing", func() {
defer sess.CloseWithError(0, "")
str, err := sess.AcceptStream(context.Background())
Expect(err).ToNot(HaveOccurred())
data, err := ioutil.ReadAll(str)
data, err := io.ReadAll(str)
Expect(err).ToNot(HaveOccurred())
Expect(data).To(Equal(PRData))
}

6
integrationtests/self/rtt_test.go
View File

@@ -3,7 +3,7 @@ package self_test
import (
"context"
"fmt"
"io/ioutil"
"io"
"net"
"time"
@@ -48,7 +48,7 @@ var _ = Describe("non-zero RTT", func() {
Expect(err).ToNot(HaveOccurred())
str, err := sess.AcceptStream(context.Background())
Expect(err).ToNot(HaveOccurred())
data, err := ioutil.ReadAll(str)
data, err := io.ReadAll(str)
Expect(err).ToNot(HaveOccurred())
Expect(data).To(Equal(PRData))
sess.CloseWithError(0, "")
@@ -84,7 +84,7 @@ var _ = Describe("non-zero RTT", func() {
Expect(err).ToNot(HaveOccurred())
str, err := sess.AcceptStream(context.Background())
Expect(err).ToNot(HaveOccurred())
data, err := ioutil.ReadAll(str)
data, err := io.ReadAll(str)
Expect(err).ToNot(HaveOccurred())
Expect(data).To(Equal(PRData))
sess.CloseWithError(0, "")

6
integrationtests/self/stream_test.go
View File

@@ -3,7 +3,7 @@ package self_test
import (
"context"
"fmt"
"io/ioutil"
"io"
"net"
"sync"
@@ -58,7 +58,7 @@ var _ = Describe("Bidirectional streams", func() {
go func() {
defer GinkgoRecover()
defer wg.Done()
dataRead, err := ioutil.ReadAll(str)
dataRead, err := io.ReadAll(str)
Expect(err).ToNot(HaveOccurred())
Expect(dataRead).To(Equal(data))
}()
@@ -77,7 +77,7 @@ var _ = Describe("Bidirectional streams", func() {
defer wg.Done()
// shouldn't use io.Copy here
// we should read from the stream as early as possible, to free flow control credit
data, err := ioutil.ReadAll(str)
data, err := io.ReadAll(str)
Expect(err).ToNot(HaveOccurred())
_, err = str.Write(data)
Expect(err).ToNot(HaveOccurred())

3
integrationtests/self/timeout_test.go
View File

@@ -5,7 +5,6 @@ import (
"context"
"fmt"
"io"
"io/ioutil"
mrand "math/rand"
"net"
"runtime/pprof"
@@ -410,7 +409,7 @@ var _ = Describe("Timeout tests", func() {
if err != nil {
return err
}
data, err := ioutil.ReadAll(str)
data, err := io.ReadAll(str)
if err != nil {
return err
}

2
integrationtests/self/tracer_test.go
View File

@@ -136,7 +136,7 @@ var _ = Describe("Handshake tests", func() {
defer sess.CloseWithError(0, "")
str, err := sess.AcceptUniStream(context.Background())
Expect(err).ToNot(HaveOccurred())
data, err := ioutil.ReadAll(str)
data, err := io.ReadAll(str)
Expect(err).ToNot(HaveOccurred())
Expect(data).To(Equal(PRData))
})

4
integrationtests/self/uni_stream_test.go
View File

@@ -3,7 +3,7 @@ package self_test
import (
"context"
"fmt"
"io/ioutil"
"io"
"net"
"sync"
@@ -61,7 +61,7 @@ var _ = Describe("Unidirectional Streams", func() {
go func() {
defer GinkgoRecover()
defer wg.Done()
data, err := ioutil.ReadAll(str)
data, err := io.ReadAll(str)
Expect(err).ToNot(HaveOccurred())
Expect(data).To(Equal(dataForStream(str.StreamID())))
}()

10
integrationtests/self/zero_rtt_test.go
View File

@@ -4,7 +4,7 @@ import (
"context"
"crypto/tls"
"fmt"
"io/ioutil"
"io"
mrand "math/rand"
"net"
"sort"
@@ -117,7 +117,7 @@ var _ = Describe("0-RTT", func() {
Expect(err).ToNot(HaveOccurred())
str, err := sess.AcceptUniStream(context.Background())
Expect(err).ToNot(HaveOccurred())
data, err := ioutil.ReadAll(str)
data, err := io.ReadAll(str)
Expect(err).ToNot(HaveOccurred())
Expect(data).To(Equal(testdata))
Expect(sess.ConnectionState().TLS.Used0RTT).To(BeTrue())
@@ -270,12 +270,12 @@ var _ = Describe("0-RTT", func() {
Expect(err).ToNot(HaveOccurred())
str, err := sess.AcceptUniStream(context.Background())
Expect(err).ToNot(HaveOccurred())
data, err := ioutil.ReadAll(str)
data, err := io.ReadAll(str)
Expect(err).ToNot(HaveOccurred())
Expect(data).To(Equal(zeroRTTData))
str, err = sess.AcceptUniStream(context.Background())
Expect(err).ToNot(HaveOccurred())
data, err = ioutil.ReadAll(str)
data, err = io.ReadAll(str)
Expect(err).ToNot(HaveOccurred())
Expect(data).To(Equal(oneRTTData))
Expect(sess.CloseWithError(0, "")).To(Succeed())
@@ -605,7 +605,7 @@ var _ = Describe("0-RTT", func() {
Expect(err).ToNot(HaveOccurred())
rstr, err := serverSess.AcceptUniStream(context.Background())
Expect(err).ToNot(HaveOccurred())
data, err := ioutil.ReadAll(rstr)
data, err := io.ReadAll(rstr)
Expect(err).ToNot(HaveOccurred())
Expect(data).To(Equal([]byte("foobar")))
Expect(serverSess.ConnectionState().TLS.Used0RTT).To(BeTrue())