Fix merge issue

lixmal · lixmal · commit 741da3902b26 · 2025-06-19T19:44:44.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)
 
@@ -818,9 +818,6 @@ func TestDefaultManagerEnableSSHRules(t *testing.T) {
 
 	acl.ApplyFiltering(networkMap, false)
 
-	expectedRules := 3
-	if fw.IsStateful() {
-		expectedRules = 3 // 2 inbound rules + SSH rule
-	}
+	expectedRules := 2
 	assert.Equal(t, expectedRules, len(acl.peerRulesPairs))
 }

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`
`@@ -818,9 +818,6 @@ func TestDefaultManagerEnableSSHRules(t *testing.T) {`
`818`	`818`
`819`	`819`	`acl.ApplyFiltering(networkMap, false)`
`820`	`820`
`821`		`- expectedRules := 3`
`822`		`- if fw.IsStateful() {`
`823`		`- expectedRules = 3 // 2 inbound rules + SSH rule`
`824`		`- }`
	`821`	`+ expectedRules := 2`
`825`	`822`	`assert.Equal(t, expectedRules, len(acl.peerRulesPairs))`
`826`	`823`	`}`