From f09ede9243fa1075f1df4d931c5cecb0844f5451 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 26 Aug 2021 17:39:32 -0700 Subject: [PATCH] wgengine/magicsock: don't configure eager WireGuard handshaking in tests. Our prod code doesn't eagerly handshake, because our disco layer enables on-demand handshaking. Configuring both peers to eagerly handshake leads to WireGuard handshake races that make TestTwoDevicePing flaky. Signed-off-by: David Anderson --- wgengine/magicsock/magicsock_test.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/wgengine/magicsock/magicsock_test.go b/wgengine/magicsock/magicsock_test.go index d2ca2ee89..f4251d5f8 100644 --- a/wgengine/magicsock/magicsock_test.go +++ b/wgengine/magicsock/magicsock_test.go @@ -950,7 +950,6 @@ func testTwoDevicePing(t *testing.T, d *devices) { PublicKey: m2.privateKey.Public(), DiscoKey: m2.conn.DiscoPublicKey(), }, - PersistentKeepalive: 25, }, }, } @@ -966,7 +965,6 @@ func testTwoDevicePing(t *testing.T, d *devices) { PublicKey: m1.privateKey.Public(), DiscoKey: m1.conn.DiscoPublicKey(), }, - PersistentKeepalive: 25, }, }, }