Skip to content

test(cryptorand): re-enable number error tests #16956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 17, 2025
Merged

test(cryptorand): re-enable number error tests #16956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions cryptorand/errors_go123_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
})
}
9 changes: 1 addition & 8 deletions cryptorand/errors_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down Expand Up @@ -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.
}
Loading