From 2b93307d0f684ec9840cf0bf93902a56dd4e7474 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Sat, 2 Apr 2022 20:23:00 +0100 Subject: [PATCH] stop using net.Error.Temporary in tests --- fuzzing/handshake/fuzz.go | 1 - internal/qerr/errors_test.go | 3 --- receive_stream_test.go | 1 - stream_test.go | 1 - streams_map_test.go | 1 - 5 files changed, 7 deletions(-) diff --git a/fuzzing/handshake/fuzz.go b/fuzzing/handshake/fuzz.go index 8c0d0ce46a8..c761ad0ca41 100644 --- a/fuzzing/handshake/fuzz.go +++ b/fuzzing/handshake/fuzz.go @@ -300,7 +300,6 @@ func runHandshake(runConfig [confLen]byte, messageConfig uint8, clientConf *tls. serverConf.ClientAuth = getClientAuth(runConfig[1] & 0b00000111) serverConf.CipherSuites = getSuites(runConfig[1] >> 6) serverConf.SessionTicketsDisabled = helper.NthBit(runConfig[1], 3) - clientConf.PreferServerCipherSuites = helper.NthBit(runConfig[1], 4) if helper.NthBit(runConfig[2], 0) { clientConf.RootCAs = x509.NewCertPool() } diff --git a/internal/qerr/errors_test.go b/internal/qerr/errors_test.go index b2a3cca5faf..5a825b8c4be 100644 --- a/internal/qerr/errors_test.go +++ b/internal/qerr/errors_test.go @@ -73,7 +73,6 @@ var _ = Describe("QUIC Errors", func() { nerr, ok := err.(net.Error) Expect(ok).To(BeTrue()) Expect(nerr.Timeout()).To(BeTrue()) - Expect(nerr.Temporary()).To(BeFalse()) Expect(err.Error()).To(Equal("timeout: handshake did not complete in time")) }) @@ -84,7 +83,6 @@ var _ = Describe("QUIC Errors", func() { nerr, ok := err.(net.Error) Expect(ok).To(BeTrue()) Expect(nerr.Timeout()).To(BeTrue()) - Expect(nerr.Temporary()).To(BeFalse()) Expect(err.Error()).To(Equal("timeout: no recent network activity")) }) }) @@ -112,7 +110,6 @@ var _ = Describe("QUIC Errors", func() { nerr, ok := err.(net.Error) Expect(ok).To(BeTrue()) Expect(nerr.Timeout()).To(BeFalse()) - Expect(nerr.Temporary()).To(BeTrue()) }) }) diff --git a/receive_stream_test.go b/receive_stream_test.go index 088be4297d1..51a8414f230 100644 --- a/receive_stream_test.go +++ b/receive_stream_test.go @@ -218,7 +218,6 @@ var _ = Describe("Receive Stream", func() { Context("deadlines", func() { It("the deadline error has the right net.Error properties", func() { - Expect(errDeadline.Temporary()).To(BeTrue()) Expect(errDeadline.Timeout()).To(BeTrue()) Expect(errDeadline).To(MatchError("deadline exceeded")) }) diff --git a/stream_test.go b/stream_test.go index c3d0f016208..b382efee99b 100644 --- a/stream_test.go +++ b/stream_test.go @@ -99,7 +99,6 @@ var _ = Describe("Stream", func() { var _ = Describe("Deadline Error", func() { It("is a net.Error that wraps os.ErrDeadlineError", func() { err := deadlineError{} - Expect(err.Temporary()).To(BeTrue()) Expect(err.Timeout()).To(BeTrue()) Expect(errors.Is(err, os.ErrDeadlineExceeded)).To(BeTrue()) Expect(errors.Unwrap(err)).To(Equal(os.ErrDeadlineExceeded)) diff --git a/streams_map_test.go b/streams_map_test.go index ffce136b750..29ce7efc1f8 100644 --- a/streams_map_test.go +++ b/streams_map_test.go @@ -38,7 +38,6 @@ func expectTooManyStreamsError(err error) { ExpectWithOffset(1, err.Error()).To(Equal(errTooManyOpenStreams.Error())) nerr, ok := err.(net.Error) ExpectWithOffset(1, ok).To(BeTrue()) - ExpectWithOffset(1, nerr.Temporary()).To(BeTrue()) ExpectWithOffset(1, nerr.Timeout()).To(BeFalse()) }