Fix merge issue

lixmal · lixmal · commit 59b4dbf8f713 · 2025-06-19T19:43:55.000+02:00
diff --git a/client/internal/acl/manager_test.go b/client/internal/acl/manager_test.go
@@ -660,7 +660,7 @@ func TestDefaultManagerSquashRulesWithPortRestrictions(t *testing.T) {
 			}
 
 			manager := &DefaultManager{}
-			rules, _ := manager.squashAcceptRules(networkMap)
+			rules := manager.squashAcceptRules(networkMap)
 
 			assert.Equal(t, tt.expectedCount, len(rules), tt.description)
 

Original file line number	Diff line number	Diff line change
`@@ -660,7 +660,7 @@ func TestDefaultManagerSquashRulesWithPortRestrictions(t *testing.T) {`
`660`	`660`	`}`
`661`	`661`
`662`	`662`	`manager := &DefaultManager{}`
`663`		`- rules, _ := manager.squashAcceptRules(networkMap)`
	`663`	`+ rules := manager.squashAcceptRules(networkMap)`
`664`	`664`
`665`	`665`	`assert.Equal(t, tt.expectedCount, len(rules), tt.description)`
`666`	`666`