From 9beea8b314f68d2aec0370f12817004b7a588183 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Mon, 27 Jul 2020 20:34:17 +0000 Subject: [PATCH] wgengine/magicsock: remove unnecessary use of context. Signed-off-by: David Anderson --- wgengine/magicsock/magicsock_test.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/wgengine/magicsock/magicsock_test.go b/wgengine/magicsock/magicsock_test.go index 082f6b0b1..a99929d07 100644 --- a/wgengine/magicsock/magicsock_test.go +++ b/wgengine/magicsock/magicsock_test.go @@ -807,16 +807,13 @@ func testActiveDiscovery(t *testing.T, d *devices) { // from DERP. mustDirect := func(m1, m2 *magicStack) { - ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) - defer cancel() - for ctx.Err() == nil { + for deadline := time.Now().Add(5 * time.Second); time.Now().Before(deadline); time.Sleep(10 * time.Millisecond) { pst := m1.Status().Peer[m2.Public()] if pst.CurAddr != "" { logf("direct link %s->%s found with addr %s", m1, m2, pst.CurAddr) return } logf("no direct path %s->%s yet, addrs %v", m1, m2, pst.Addrs) - time.Sleep(100 * time.Millisecond) } t.Errorf("magicsock did not find a direct path from %s to %s", m1, m2) }