Skip to content

test(config): use synctest in TestAddFlags for avoiding nondeterminism #3311

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
julienrbrt merged 3 commits into from
May 7, 2026
+124 −119
Merged

test(config): use synctest in TestAddFlags for avoiding nondeterminism #3311

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be48b91
fix(config): de-flake TestAddFlags by stubbing time source
CaelRowley May 6, 2026
5d75d8a
Merge branch 'main' into cael/fix/flaky-namespace-test
CaelRowley May 6, 2026
890b784
test(config): de-flake TestAddFlags via testing/synctest
CaelRowley May 7, 2026
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
6 changes: 6 additions & 0 deletions pkg/config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@ func TestDefaultConfig(t *testing.T) {
}

func TestAddFlags(t *testing.T) {
Copy link
Copy Markdown
Member

@julienrbrt julienrbrt May 6, 2026

Choose a reason for hiding this comment

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

Let's use testing/synctest instead.

Copy link
Copy Markdown
Contributor Author

@CaelRowley CaelRowley May 7, 2026

Choose a reason for hiding this comment

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

Yeah good suggestion, then we dont need to modify config/defaults.go updated 👍

// Freeze the time source feeding randString so AddFlags' internal DefaultConfig()
// and the per-assertion DefaultConfig() calls below produce the same DA.Namespace seed.
origNowUnix := nowUnix
nowUnix = func() int64 { return 2_000_000_000 }
t.Cleanup(func() { nowUnix = origNowUnix })

// Create a command with flags
cmd := &cobra.Command{Use: "test"}
AddGlobalFlags(cmd, "test") // Add basic flags first
Expand Down
5 changes: 4 additions & 1 deletion pkg/config/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,13 @@ func DefaultConfig() Config {
}
}

// nowUnix returns the current Unix timestamp; package-level so tests can stub it.
var nowUnix = func() int64 { return time.Now().Unix() }

func randString(length int) string {
const charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
result := make([]byte, length)
rng := rand.New(rand.NewSource(time.Now().Unix())) //nolint:gosec // even half random is good enough here.
rng := rand.New(rand.NewSource(nowUnix())) //nolint:gosec // even half random is good enough here.
for i := range result {
result[i] = charset[rng.Intn(len(charset))]
}
Expand Down