Skip to content

Fix flaky ipset unit test #671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 7, 2020
Merged

Fix flaky ipset unit test #671

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4a6b4b9
Improve TestDestroy unit test validation to make it not flaky.
csfmomo Aug 27, 2020
79ff1ec
Change set name to be specific for every unit test scenario and avoid…
csfmomo Sep 16, 2020
457111a
Save cherry pick contents.
csfmomo Sep 16, 2020
184937b
Change test set name.
csfmomo Sep 16, 2020
1312a9a
Change ipset destroy unit test validation criteira.
csfmomo Sep 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 27 additions & 5 deletions npm/ipsm/ipsm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ func TestDeleteSet(t *testing.T) {
}
}()

testSetName := "test-set"
testSetName := "test-delete-set"
if err := ipsMgr.CreateSet(testSetName, append([]string{util.IpsetNetHashFlag})); err != nil {
t.Errorf("TestDeleteSet failed @ ipsMgr.CreateSet")
}
Expand Down Expand Up @@ -350,7 +350,7 @@ func TestDeleteFromSet(t *testing.T) {
}
}()

testSetName := "test-set"
testSetName := "test-delete-from-set"
if err := ipsMgr.AddToSet(testSetName, "1.2.3.4", util.IpsetNetHashFlag, ""); err != nil {
t.Errorf("TestDeleteFromSet failed @ ipsMgr.AddToSet")
}
Expand Down Expand Up @@ -468,12 +468,34 @@ func TestDestroy(t *testing.T) {
}
}()

if err := ipsMgr.AddToSet("test-destroy-set", "1.2.3.4", util.IpsetNetHashFlag, ""); err != nil {
setName := "test-destroy"
testIP := "1.2.3.4"
if err := ipsMgr.AddToSet(setName, testIP, util.IpsetNetHashFlag, ""); err != nil {
t.Errorf("TestDestroy failed @ ipsMgr.AddToSet")
}

if err := ipsMgr.Destroy(); err != nil {
t.Errorf("TestDestroy failed @ ipsMgr.Destroy")
// Call Destroy and validate. Destroy can only work when no ipset is referenced from iptables.
if err := ipsMgr.Destroy(); err == nil {
// Validate ipset is not exist when destroy can happen.
entry := &ipsEntry{
operationFlag: util.IPsetCheckListFlag,
set: util.GetHashedName(setName),
}

if _, err := ipsMgr.Run(entry); err == nil {
t.Errorf("TestDestroy failed @ ipsMgr.Destroy since %s still exist in kernel", setName)
}
} else {
// Validate ipset entries are gone from flush command when destroy can not happen.
entry := &ipsEntry{
operationFlag: util.IpsetTestFlag,
set: util.GetHashedName(setName),
spec: append([]string{testIP}),
}

if _, err := ipsMgr.Run(entry); err == nil {
t.Errorf("TestDestroy failed @ ipsMgr.Destroy since %s still exist in ipset", testIP)
}
}
}

Expand Down