Fix flaky e2e test

slackhq · Oct 11, 2024 · c4ef068 · c4ef068
1 parent a670be3
commit c4ef068
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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)