extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-06-21 10:18:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix test

Browse Source
This commit is contained in:
Pascal Fischer 2023-06-28 10:35:29 +02:00
parent 33a155d9aa
commit 54fe05f6d8
1 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
client/firewall/uspfilter/uspfilter_test.go
View File

@ -123,8 +123,8 @@ func TestManagerDeleteRule(t *testing.T) {
return return
} }
if idx, ok := m.rulesIndex[rule2.GetRuleID()]; !ok || len(m.incomingRules) != 1 || idx != 0 { if _, ok := m.incomingRules[ip.String()][rule2.GetRuleID()]; !ok {
t.Errorf("rule2 is not in the rulesIndex") t.Errorf("rule2 is not in the incomingRules")
} }
err = m.DeleteRule(rule2) err = m.DeleteRule(rule2)
@ -133,8 +133,8 @@ func TestManagerDeleteRule(t *testing.T) {
return return
} }
if len(m.rulesIndex) != 0 || len(m.incomingRules) != 0 { if _, ok := m.incomingRules[ip.String()][rule2.GetRuleID()]; ok {
t.Errorf("rule1 still in the rulesIndex") t.Errorf("rule2 is not in the incomingRules")
} }
} }
@ -169,26 +169,29 @@ func TestAddUDPPacketHook(t *testing.T) {
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
manager := &Manager{ manager := &Manager{
incomingRules: []Rule{}, incomingRules: map[string]map[string]Rule{},
outgoingRules: []Rule{}, outgoingRules: map[string]map[string]Rule{},
rulesIndex: make(map[string]int),
} }
manager.AddUDPPacketHook(tt.in, tt.ip, tt.dPort, tt.hook) manager.AddUDPPacketHook(tt.in, tt.ip, tt.dPort, tt.hook)
var addedRule Rule var addedRule Rule
if tt.in { if tt.in {
if len(manager.incomingRules) != 1 { if len(manager.incomingRules[tt.ip.String()]) != 1 {
t.Errorf("expected 1 incoming rule, got %d", len(manager.incomingRules)) t.Errorf("expected 1 incoming rule, got %d", len(manager.incomingRules))
return return
} }
addedRule = manager.incomingRules[0] for _, rule := range manager.incomingRules[tt.ip.String()] {
addedRule = rule
}
} else { } else {
if len(manager.outgoingRules) != 1 { if len(manager.outgoingRules) != 1 {
t.Errorf("expected 1 outgoing rule, got %d", len(manager.outgoingRules)) t.Errorf("expected 1 outgoing rule, got %d", len(manager.outgoingRules))
return return
} }
addedRule = manager.outgoingRules[0] for _, rule := range manager.outgoingRules[tt.ip.String()] {
addedRule = rule
}
} }
if !tt.ip.Equal(addedRule.ip) { if !tt.ip.Equal(addedRule.ip) {
@ -211,17 +214,6 @@ func TestAddUDPPacketHook(t *testing.T) {
t.Errorf("expected udpHook to be set") t.Errorf("expected udpHook to be set")
return return
} }
// Ensure rulesIndex is correctly updated
index, ok := manager.rulesIndex[addedRule.id]
if !ok {
t.Errorf("expected rule to be in rulesIndex")
return
}
if index != 0 {
t.Errorf("expected rule index to be 0, got %d", index)
return
}
}) })
} }
} }
@ -256,7 +248,7 @@ func TestManagerReset(t *testing.T) {
return return
} }
if len(m.rulesIndex) != 0 || len(m.outgoingRules) != 0 || len(m.incomingRules) != 0 { if len(m.outgoingRules) != 0 || len(m.incomingRules) != 0 {
t.Errorf("rules is not empty") t.Errorf("rules is not empty")
} }
} }
@ -346,12 +338,14 @@ func TestRemovePacketHook(t *testing.T) {
// Assert the hook is added by finding it in the manager's outgoing rules // Assert the hook is added by finding it in the manager's outgoing rules
found := false found := false
for _, rule := range manager.outgoingRules { for _, arr := range manager.outgoingRules {
for _, rule := range arr {
if rule.id == hookID { if rule.id == hookID {
found = true found = true
break break
} }
} }
}
if !found { if !found {
t.Fatalf("The hook was not added properly.") t.Fatalf("The hook was not added properly.")
@ -364,12 +358,14 @@ func TestRemovePacketHook(t *testing.T) {
} }
// Assert the hook is removed by checking it in the manager's outgoing rules // Assert the hook is removed by checking it in the manager's outgoing rules
for _, rule := range manager.outgoingRules { for _, arr := range manager.outgoingRules {
for _, rule := range arr {
if rule.id == hookID { if rule.id == hookID {
t.Fatalf("The hook was not removed properly.") t.Fatalf("The hook was not removed properly.")
} }
} }
} }
}
func TestUSPFilterCreatePerformance(t *testing.T) { func TestUSPFilterCreatePerformance(t *testing.T) {
for _, testMax := range []int{10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 200, 300, 400, 500, 600, 700, 800, 900, 1000} { for _, testMax := range []int{10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 200, 300, 400, 500, 600, 700, 800, 900, 1000} {