From e385bad55449c9e221e36c3a9c06fbdea4ddba73 Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Mon, 19 May 2025 16:15:21 +0200 Subject: [PATCH] cleanup skipv1 Signed-off-by: Kristoffer Dalby --- hscontrol/policy/route_approval_test.go | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/hscontrol/policy/route_approval_test.go b/hscontrol/policy/route_approval_test.go index 90d5f98e..19d61d82 100644 --- a/hscontrol/policy/route_approval_test.go +++ b/hscontrol/policy/route_approval_test.go @@ -60,7 +60,6 @@ func TestNodeCanApproveRoute(t *testing.T) { route netip.Prefix policy string canApprove bool - skipV1 bool }{ { name: "allow-all-routes-for-admin-user", @@ -766,10 +765,10 @@ func TestNodeCanApproveRoute(t *testing.T) { canApprove: false, }, { - name: "empty-policy", - node: normalNode, - route: p("192.168.1.0/24"), - policy: `{"acls":[{"action":"accept","src":["*"],"dst":["*:*"]}]}`, + name: "empty-policy", + node: normalNode, + route: p("192.168.1.0/24"), + policy: `{"acls":[{"action":"accept","src":["*"],"dst":["*:*"]}]}`, canApprove: false, }, } @@ -789,13 +788,7 @@ func TestNodeCanApproveRoute(t *testing.T) { } for i, pm := range policyManagers { - versionNum := i + 1 - if versionNum == 1 && tt.skipV1 { - // Skip V1 policy manager for specific tests - continue - } - - t.Run(fmt.Sprintf("PolicyV%d", versionNum), func(t *testing.T) { + t.Run(fmt.Sprintf("policy-index%d", i), func(t *testing.T) { result := pm.NodeCanApproveRoute(&tt.node, tt.route) if diff := cmp.Diff(tt.canApprove, result); diff != "" {