diff options
| author | David Crawshaw <crawshaw@tailscale.com> | 2020-03-08 09:25:45 -0400 |
|---|---|---|
| committer | David Crawshaw <crawshaw@tailscale.com> | 2020-03-08 09:29:37 -0400 |
| commit | e201f6323066c525d354f9ef6bcdb55d751bbab4 (patch) | |
| tree | 903c0cc514bb657dbb8f312184b798b71c18430b | |
| parent | f5e0407e9714d09e1f23d4916cec6f200563d566 (diff) | |
| download | tailscale-crawshaw/e2e_test.tar.xz tailscale-crawshaw/e2e_test.zip | |
magicsock: unskip tests that are reliablecrawshaw/e2e_test
Signed-off-by: David Crawshaw <crawshaw@tailscale.com>
| -rw-r--r-- | wgengine/magicsock/magicsock_test.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/wgengine/magicsock/magicsock_test.go b/wgengine/magicsock/magicsock_test.go index 44572765a..bb26ee589 100644 --- a/wgengine/magicsock/magicsock_test.go +++ b/wgengine/magicsock/magicsock_test.go @@ -327,10 +327,6 @@ func TestDeviceStartStop(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. // (Do it now, or derpHost will try to connect to derp1.tailscale.com.) derpServer, derpAddr, derpCleanupFn := runDERP(t) @@ -391,7 +387,6 @@ func TestTwoDevicePing(t *testing.T) { SkipBindUpdate: true, }) dev1.Up() - defer dev1.Close() // TODO(crawshaw): this hangs if err := dev1.Reconfig(&cfgs[0]); err != nil { t.Fatal(err) } @@ -404,7 +399,6 @@ func TestTwoDevicePing(t *testing.T) { SkipBindUpdate: true, }) dev2.Up() - defer dev2.Close() // TODO(crawshaw): this hangs if err := dev2.Reconfig(&cfgs[1]); err != nil { t.Fatal(err) @@ -464,6 +458,12 @@ func TestTwoDevicePing(t *testing.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) { msg := func(i int) []byte { b := tuntest.Ping(net.ParseIP("1.0.0.2"), net.ParseIP("1.0.0.1")) |