Skip to content
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

Fix rand source in name #3070

Merged
merged 1 commit into from
Jun 26, 2024
Merged

Fix rand source in name #3070

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
8 changes: 7 additions & 1 deletion test/helpers/name.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package helpers
import (
"math/rand"
"strings"
"sync"
"time"
"unicode"
)
Expand All @@ -32,7 +33,10 @@ const (
testNamePrefix = "Test"
)

var nameRand *rand.Rand
var (
nameRand *rand.Rand
nameMu sync.Mutex
)

func init() {
// Properly seed the random number generator so RandomString() is actually random.
Expand Down Expand Up @@ -75,9 +79,11 @@ func AppendRandomString(prefix string) string {
// RandomString will generate a random string.
func RandomString() string {
suffix := make([]byte, randSuffixLen)
nameMu.Lock()
for i := range suffix {
suffix[i] = letterBytes[nameRand.Intn(len(letterBytes))]
}
nameMu.Unlock()
Comment on lines +82 to +86
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor tweak - let's just do a defer unlock

Suggested change
nameMu.Lock()
for i := range suffix {
suffix[i] = letterBytes[nameRand.Intn(len(letterBytes))]
}
nameMu.Unlock()
nameMu.Lock()
defer nameMu.Unlock()
for i := range suffix {
suffix[i] = letterBytes[nameRand.Intn(len(letterBytes))]
}

return string(suffix)
}

Expand Down
Loading