From b3e9e71bd5ff15e5d0e86d06e243f5d02ccdb208 Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Mon, 17 Mar 2025 12:29:02 +0200 Subject: [PATCH] test(cryptorand): re-enable number error tests Realized it was only the `StringCharset` test that lead to panic, the number tests bypass it by reading via the `binary` package. --- cryptorand/errors_go123_test.go | 35 +++++++++++++++++++++++++++++++++ cryptorand/errors_test.go | 9 +-------- 2 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 cryptorand/errors_go123_test.go diff --git a/cryptorand/errors_go123_test.go b/cryptorand/errors_go123_test.go new file mode 100644 index 0000000000000..782895ad08c2f --- /dev/null +++ b/cryptorand/errors_go123_test.go @@ -0,0 +1,35 @@ +//go:build !go1.24 + +package cryptorand_test + +import ( + "crypto/rand" + "io" + "testing" + "testing/iotest" + + "github.com/stretchr/testify/require" + + "github.com/coder/coder/v2/cryptorand" +) + +// TestRandError_pre_Go1_24 checks that the code handles errors when +// reading from the rand.Reader. +// +// This test replaces the global rand.Reader, so cannot be parallelized +// +//nolint:paralleltest +func TestRandError_pre_Go1_24(t *testing.T) { + origReader := rand.Reader + t.Cleanup(func() { + rand.Reader = origReader + }) + + rand.Reader = iotest.ErrReader(io.ErrShortBuffer) + + // Testing `rand.Reader.Read` for errors will panic in Go 1.24 and later. + t.Run("StringCharset", func(t *testing.T) { + _, err := cryptorand.HexString(10) + require.ErrorIs(t, err, io.ErrShortBuffer, "expected HexString error") + }) +} diff --git a/cryptorand/errors_test.go b/cryptorand/errors_test.go index cafd2156db620..87681b08ebb43 100644 --- a/cryptorand/errors_test.go +++ b/cryptorand/errors_test.go @@ -1,7 +1,3 @@ -//go:build !go1.24 - -// Testing `rand.Reader.Read` for errors will panic in Go 1.24 and later. - package cryptorand_test import ( @@ -49,8 +45,5 @@ func TestRandError(t *testing.T) { require.ErrorIs(t, err, io.ErrShortBuffer, "expected Float64 error") }) - t.Run("StringCharset", func(t *testing.T) { - _, err := cryptorand.HexString(10) - require.ErrorIs(t, err, io.ErrShortBuffer, "expected HexString error") - }) + // See errors_go123_test.go for the StringCharset test. } pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy