tomas
/
pocketbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

retry the random func to minimize tests flakiness

This commit is contained in:
Gani Georgiev 2025-08-31 23:15:31 +03:00
parent 172b1f96f7
commit 9e13418565
2 changed files with 82 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/security/random_by_regex_test.go
View File

@ -35,6 +35,8 @@ func TestRandomStringByRegex(t *testing.T) {
for i, s := range scenarios { for i, s := range scenarios {
t.Run(fmt.Sprintf("%d_%q", i, s.pattern), func(t *testing.T) { t.Run(fmt.Sprintf("%d_%q", i, s.pattern), func(t *testing.T) {
var run func(int)
run = func(attempt int) {
str, err := security.RandomStringByRegex(s.pattern, s.flags...) str, err := security.RandomStringByRegex(s.pattern, s.flags...)
hasErr := err != nil hasErr := err != nil
@ -50,16 +52,24 @@ func TestRandomStringByRegex(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
if !r.Match([]byte(str)) { if !r.Match([]byte(str)) {
t.Fatalf("Expected %q to match pattern %v", str, s.pattern) t.Fatalf("Expected %q to match pattern %v", str, s.pattern)
} }
if slices.Contains(generated, str) { if slices.Contains(generated, str) {
if attempt > 3 {
t.Fatalf("The generated string %q already exists in\n%v", str, generated) t.Fatalf("The generated string %q already exists in\n%v", str, generated)
} }
// rerun
run(attempt + 1)
return
}
generated = append(generated, str) generated = append(generated, str)
}
run(1)
}) })
} }
} }

35
tools/security/random_test.go
View File

@ -3,6 +3,7 @@ package security_test
import ( import (
"fmt" "fmt"
"regexp" "regexp"
"slices"
"testing" "testing"
"github.com/pocketbase/pocketbase/tools/security" "github.com/pocketbase/pocketbase/tools/security"
@ -38,10 +39,12 @@ func testRandomStringWithAlphabet(t *testing.T, randomFunc func(n int, alphabet
for i, s := range scenarios { for i, s := range scenarios {
t.Run(fmt.Sprintf("%d_%q", i, s.alphabet), func(t *testing.T) { t.Run(fmt.Sprintf("%d_%q", i, s.alphabet), func(t *testing.T) {
generated := make([]string, 0, 1000) generated := make([]string, 0, 500)
length := 10 length := 10
for j := 0; j < 1000; j++ { for j := 0; j < 500; j++ {
var run func(int)
run = func(attempt int) {
result := randomFunc(length, s.alphabet) result := randomFunc(length, s.alphabet)
if len(result) != length { if len(result) != length {
@ -53,24 +56,33 @@ func testRandomStringWithAlphabet(t *testing.T, randomFunc func(n int, alphabet
t.Fatalf("(%d) The generated string should have only %s characters, got %q", j, s.expectPattern, result) t.Fatalf("(%d) The generated string should have only %s characters, got %q", j, s.expectPattern, result)
} }
for _, str := range generated { if slices.Contains(generated, result) {
if str == result { if attempt > 3 {
t.Fatalf("(%d) Repeating random string - found %q in %q", j, result, generated) t.Fatalf("(%d) Repeating random string - found %q in %q", j, result, generated)
} }
// rerun
run(attempt + 1)
return
} }
generated = append(generated, result) generated = append(generated, result)
} }
run(1)
}
}) })
} }
} }
func testRandomString(t *testing.T, randomFunc func(n int) string) { func testRandomString(t *testing.T, randomFunc func(n int) string) {
generated := make([]string, 0, 1000) generated := make([]string, 0, 500)
reg := regexp.MustCompile(`[a-zA-Z0-9]+`) reg := regexp.MustCompile(`[a-zA-Z0-9]+`)
length := 10 length := 10
for i := 0; i < 1000; i++ { for i := 0; i < 500; i++ {
var run func(int)
run = func(attempt int) {
result := randomFunc(length) result := randomFunc(length)
if len(result) != length { if len(result) != length {
@ -81,12 +93,19 @@ func testRandomString(t *testing.T, randomFunc func(n int) string) {
t.Fatalf("(%d) The generated string should have only [a-zA-Z0-9]+ characters, got %q", i, result) t.Fatalf("(%d) The generated string should have only [a-zA-Z0-9]+ characters, got %q", i, result)
} }
for _, str := range generated { if slices.Contains(generated, result) {
if str == result { if attempt > 3 {
t.Fatalf("(%d) Repeating random string - found %q in \n%v", i, result, generated) t.Fatalf("(%d) Repeating random string - found %q in \n%v", i, result, generated)
} }
// rerun
run(attempt + 1)
return
} }
generated = append(generated, result) generated = append(generated, result)
} }
run(1)
}
} }