From 86d1c4eceb302d81cfd2b8f2de06751fc0745c30 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Mon, 30 Aug 2021 15:32:06 -0700 Subject: [PATCH] wgengine/magicsock: ignore close races even harder. Signed-off-by: David Anderson --- wgengine/magicsock/magicsock_test.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/wgengine/magicsock/magicsock_test.go b/wgengine/magicsock/magicsock_test.go index c63dbc7d1..d2ca2ee89 100644 --- a/wgengine/magicsock/magicsock_test.go +++ b/wgengine/magicsock/magicsock_test.go @@ -289,16 +289,12 @@ func meshStacks(logf logger.Logf, mutateNetmap func(idx int, nm *netmap.NetworkM m.conn.UpdatePeers(peerSet) wg, err := nmcfg.WGCfg(nm, logf, netmap.AllowSingleHosts, "") if err != nil { - if ctx.Err() != nil { - // shutdown race, don't care. - return - } // We're too far from the *testing.T to be graceful, // blow up. Shouldn't happen anyway. panic(fmt.Sprintf("failed to construct wgcfg from netmap: %v", err)) } if err := m.Reconfig(wg); err != nil { - if ctx.Err() != nil { + if ctx.Err() != nil || errors.Is(err, errConnClosed) { // shutdown race, don't care. return }