TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-10-20 15:10:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/magicsock: turn down timeouts in tests

Browse Source 
Before:

	--- PASS: TestActiveDiscovery (11.78s)
	    --- PASS: TestActiveDiscovery/facing_easy_firewalls (5.89s)
	    --- PASS: TestActiveDiscovery/facing_nats (5.89s)
	    --- PASS: TestActiveDiscovery/simple_internet (0.89s)

After:

	--- PASS: TestActiveDiscovery (1.98s)
	    --- PASS: TestActiveDiscovery/facing_easy_firewalls (0.99s)
	    --- PASS: TestActiveDiscovery/facing_nats (0.99s)
	    --- PASS: TestActiveDiscovery/simple_internet (0.89s)

Signed-off-by: David Crawshaw <crawshaw@tailscale.com>
This commit is contained in:
David Crawshaw
2021-10-19 05:10:38 -07:00
committed by David Crawshaw
parent eaa0aef934
commit 3552d86525
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wgengine/magicsock/magicsock_test.go
View File

@@ -743,6 +743,18 @@ func TestActiveDiscovery(t *testing.T) {
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) {
mstun := &natlab.Machine{Name: "stun"}
m1 := &natlab.Machine{