adelorenzo/kilo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix existing tests

Browse Source
This commit is contained in:
Clive Jevons 2022-07-26 11:41:23 +02:00 committed by Alex Stockinger
parent c28a1a24d8
commit d3332fe176
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/iptables/iptables_test.go
View File

@ -16,6 +16,8 @@ package iptables
import ( import (
"testing" "testing"
"github.com/prometheus/client_golang/prometheus"
) )
var rules = []Rule{ var rules = []Rule{
@ -89,8 +91,9 @@ func TestSet(t *testing.T) {
t.Fatalf("test case %q: got unexpected error instantiating controller: %v", tc.name, err) t.Fatalf("test case %q: got unexpected error instantiating controller: %v", tc.name, err)
} }
for i := range tc.sets { for i := range tc.sets {
if err := controller.Set(tc.sets[i]); err != nil { ruleSet := RuleSet{AppendRules: tc.sets[i]}
t.Fatalf("test case %q: got unexpected error seting rule set %d: %v", tc.name, i, err) if err := controller.Set(ruleSet); err != nil {
t.Fatalf("test case %q: got unexpected error setting rule set %d: %v", tc.name, i, err)
} }
} }
for i, f := range tc.actions { for i, f := range tc.actions {
@ -110,12 +113,12 @@ func TestSet(t *testing.T) {
} }
} }
} }
if len(tc.out) != len(controller.rules) { if len(tc.out) != len(controller.appendRules) {
t.Errorf("test case %q: expected %d rules in controller, got %d", tc.name, len(tc.out), len(controller.rules)) t.Errorf("test case %q: expected %d rules in controller, got %d", tc.name, len(tc.out), len(controller.appendRules))
} else { } else {
for i := range tc.out { for i := range tc.out {
if tc.out[i].String() != controller.rules[i].String() { if tc.out[i].String() != controller.appendRules[i].String() {
t.Errorf("test case %q: expected rule %d in controller to be equal: expected %v, got %v", tc.name, i, tc.out[i], controller.rules[i]) t.Errorf("test case %q: expected rule %d in controller to be equal: expected %v, got %v", tc.name, i, tc.out[i], controller.appendRules[i])
} }
} }
} }
@ -145,11 +148,12 @@ func TestCleanUp(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("test case %q: got unexpected error instantiating controller: %v", tc.name, err) t.Fatalf("test case %q: got unexpected error instantiating controller: %v", tc.name, err)
} }
if err := controller.Set(tc.rules); err != nil { ruleSet := RuleSet{AppendRules: tc.rules}
if err := controller.Set(ruleSet); err != nil {
t.Fatalf("test case %q: Set should not fail: %v", tc.name, err) t.Fatalf("test case %q: Set should not fail: %v", tc.name, err)
} }
if len(client.storage) != len(tc.rules) { if len(client.storage) != len(tc.rules) {
t.Errorf("test case %q: expected %d rules in storage, got %d rules", tc.name, len(tc.rules), len(client.storage)) t.Errorf("test case %q: expected %d rules in storage, got %d rules", tc.name, len(ruleSet.AppendRules), len(client.storage))
} }
if err := controller.CleanUp(); err != nil { if err := controller.CleanUp(); err != nil {
t.Errorf("test case %q: got unexpected error: %v", tc.name, err) t.Errorf("test case %q: got unexpected error: %v", tc.name, err)

3
pkg/iptables/rulecache_test.go
View File

@ -101,7 +101,8 @@ func TestRuleCache(t *testing.T) {
client := &fakeClient{} client := &fakeClient{}
controller.v4 = client controller.v4 = client
controller.v6 = client controller.v6 = client
if err := controller.Set(tc.rules); err != nil { ruleSet := RuleSet{AppendRules: tc.rules}
if err := controller.Set(ruleSet); err != nil {
t.Fatalf("test case %q: Set should not fail: %v", tc.name, err) t.Fatalf("test case %q: Set should not fail: %v", tc.name, err)
} }
// Reset the client's calls so we can examine how many times // Reset the client's calls so we can examine how many times