TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-12-02 22:45:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

magicsock: unskip tests that are reliable

Browse Source 
Signed-off-by: David Crawshaw <crawshaw@tailscale.com>
This commit is contained in:
David Crawshaw 2020-03-08 09:25:45 -04:00
parent f5e0407e97
commit e201f63230
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wgengine/magicsock/magicsock_test.go
View File

@ -327,10 +327,6 @@ func TestDeviceStartStop(t *testing.T) {
} }
func TestTwoDevicePing(t *testing.T) { func TestTwoDevicePing(t *testing.T) {
if os.Getenv("RUN_CURSED_TESTS") == "" {
t.Skip("test is very broken, don't run in CI until it's reliable.")
}
// Wipe default DERP list, add local server. // Wipe default DERP list, add local server.
// (Do it now, or derpHost will try to connect to derp1.tailscale.com.) // (Do it now, or derpHost will try to connect to derp1.tailscale.com.)
derpServer, derpAddr, derpCleanupFn := runDERP(t) derpServer, derpAddr, derpCleanupFn := runDERP(t)
@ -391,7 +387,6 @@ func TestTwoDevicePing(t *testing.T) {
SkipBindUpdate: true, SkipBindUpdate: true,
}) })
dev1.Up() dev1.Up()
defer dev1.Close() // TODO(crawshaw): this hangs
if err := dev1.Reconfig(&cfgs[0]); err != nil { if err := dev1.Reconfig(&cfgs[0]); err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -404,7 +399,6 @@ func TestTwoDevicePing(t *testing.T) {
SkipBindUpdate: true, SkipBindUpdate: true,
}) })
dev2.Up() dev2.Up()
defer dev2.Close() // TODO(crawshaw): this hangs
if err := dev2.Reconfig(&cfgs[1]); err != nil { if err := dev2.Reconfig(&cfgs[1]); err != nil {
t.Fatal(err) t.Fatal(err)
@ -464,6 +458,12 @@ func TestTwoDevicePing(t *testing.T) {
ping2(t) ping2(t)
}) })
if os.Getenv("RUN_CURSED_TESTS") == "" {
t.Skip("test is very broken, don't run in CI until it's reliable.")
}
defer dev1.Close() // TODO(crawshaw): this hangs
defer dev2.Close() // TODO(crawshaw): this hangs
pingSeq := func(t *testing.T, count int, totalTime time.Duration, strict bool) { pingSeq := func(t *testing.T, count int, totalTime time.Duration, strict bool) {
msg := func(i int) []byte { msg := func(i int) []byte {
b := tuntest.Ping(net.ParseIP("1.0.0.2"), net.ParseIP("1.0.0.1")) b := tuntest.Ping(net.ParseIP("1.0.0.2"), net.ParseIP("1.0.0.1"))