From c4ef068fed28d006ffe9ad7af2f4a5e35554e602 Mon Sep 17 00:00:00 2001 From: Nate Brown Date: Fri, 11 Oct 2024 16:25:35 -0500 Subject: [PATCH] Fix flaky e2e test --- e2e/handshakes_test.go | 6 ++++++ e2e/router/router.go | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/e2e/handshakes_test.go b/e2e/handshakes_test.go index 11d2f6724..03ca2afa0 100644 --- a/e2e/handshakes_test.go +++ b/e2e/handshakes_test.go @@ -976,6 +976,12 @@ func TestV2NonPrimaryWithLighthouse(t *testing.T) { }, "lighthouse": m{ "hosts": []string{lhVpnIpNet[1].Addr().String()}, + "local_allow_list": m{ + // Try and block our lighthouse updates from using the actual addresses assigned to this computer + // If we start discovering addresses the test router doesn't know about then test traffic cant flow + "10.0.0.0/24": true, + "::/0": false, + }, }, } myControl, myVpnIpNet, _, _ := newSimpleServer(cert.Version2, ca, caKey, "me ", "10.128.0.2/24, ff::2/64", o) diff --git a/e2e/router/router.go b/e2e/router/router.go index d5da587da..5e52ed77c 100644 --- a/e2e/router/router.go +++ b/e2e/router/router.go @@ -488,7 +488,7 @@ func (r *R) RouteForAllUntilTxTun(receiver *nebula.Control) []byte { c := r.getControl(a, p.To, p) if c == nil { r.Unlock() - panic("No control for udp tx " + a.String()) + panic(fmt.Sprintf("No control for udp tx %s", p.To)) } fp := r.unlockedInjectFlow(cm[x], c, p, false) c.InjectUDPPacket(p)