TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-03-20 05:01:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

magicsock: remove test data race

Browse Source 
Speculative, I haven't been able to replicate it locally.

Fixes #3156

Signed-off-by: David Crawshaw <crawshaw@tailscale.com>
This commit is contained in:
David Crawshaw 2021-10-22 10:17:53 -07:00 committed by David Crawshaw
parent 09e692e318
commit 0b62f26349
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wgengine/magicsock/magicsock_test.go
View File

@ -51,6 +51,13 @@ import (
func init() { func init() {
os.Setenv("IN_TS_TEST", "1") os.Setenv("IN_TS_TEST", "1")
// Some of these tests lose a disco pong before establishing a
// direct connection, so instead of waiting 5 seconds in the
// test, reduce the wait period.
// (In particular, TestActiveDiscovery.)
discoPingInterval = 100 * time.Millisecond
pingTimeoutDuration = 100 * time.Millisecond
} }
// WaitReady waits until the magicsock is entirely initialized and connected // WaitReady waits until the magicsock is entirely initialized and connected
@ -743,18 +750,6 @@ func TestActiveDiscovery(t *testing.T) {
testActiveDiscovery(t, n) testActiveDiscovery(t, n)
}) })
// The following tests lose a disco pong before establishing a
// direct connection, so instead of waiting 5 seconds in the
// test, reduce the wait period.
origPingTimeoutDuration := pingTimeoutDuration
origDiscoPingInterval := discoPingInterval
discoPingInterval = 100 * time.Millisecond
pingTimeoutDuration = 100 * time.Millisecond
defer func() {
pingTimeoutDuration = origPingTimeoutDuration
discoPingInterval = origDiscoPingInterval
}()
t.Run("facing_easy_firewalls", func(t *testing.T) { t.Run("facing_easy_firewalls", func(t *testing.T) {
mstun := &natlab.Machine{Name: "stun"} mstun := &natlab.Machine{Name: "stun"}
m1 := &natlab.Machine{ m1 := &natlab.Machine{