rsp2k/headscale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

derp: fix flaky shuffle test (#2772)

Browse source
This commit is contained in:
Kristoffer Dalby 2025-09-11 15:49:02 +02:00 • committed by GitHub
parent c91b9fc761
commit 7056fbb63b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
hscontrol/derp/derp.go
View file

@ -140,10 +140,13 @@ var crc64Table = crc64.MakeTable(crc64.ISO)
var ( var (
derpRandomOnce sync.Once derpRandomOnce sync.Once
derpRandomInst *rand.Rand derpRandomInst *rand.Rand
derpRandomMu sync.RWMutex derpRandomMu sync.Mutex
) )
func derpRandom() *rand.Rand { func derpRandom() *rand.Rand {
derpRandomMu.Lock()
defer derpRandomMu.Unlock()
derpRandomOnce.Do(func() { derpRandomOnce.Do(func() {
seed := cmp.Or(viper.GetString("dns.base_domain"), time.Now().String()) seed := cmp.Or(viper.GetString("dns.base_domain"), time.Now().String())
rnd := rand.New(rand.NewSource(0)) rnd := rand.New(rand.NewSource(0))

1
hscontrol/derp/derp_test.go
View file

@ -240,7 +240,6 @@ func TestShuffleDERPMapEdgeCases(t *testing.T) {
} }
} }
func TestShuffleDERPMapWithoutBaseDomain(t *testing.T) { func TestShuffleDERPMapWithoutBaseDomain(t *testing.T) {
viper.Reset() viper.Reset()
resetDerpRandomForTesting() resetDerpRandomForTesting()