Skip to content

Add list deletion and validation in unit test. #659

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 1 commit into from
Aug 19, 2020
Merged

Add list deletion and validation in unit test. #659

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 21 additions & 2 deletions npm/ipsm/ipsm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ func TestDeleteFromList(t *testing.T) {
}
}()

// Create set and validate set is created.
setName := "test-set"
if err := ipsMgr.CreateSet(setName, append([]string{util.IpsetNetHashFlag})); err != nil {
t.Errorf("TestDeleteFromList failed @ ipsMgr.CreateSet")
Expand All @@ -115,6 +116,7 @@ func TestDeleteFromList(t *testing.T) {
t.Errorf("TestDeleteFromList failed @ ipsMgr.CreateSet since %s not exist in kernel", setName)
}

// Create list, add set to list and validate set is in the list.
listName := "test-list"
if err := ipsMgr.AddToList(listName, setName); err != nil {
t.Errorf("TestDeleteFromList failed @ ipsMgr.AddToList")
Expand All @@ -130,6 +132,7 @@ func TestDeleteFromList(t *testing.T) {
t.Errorf("TestDeleteFromList failed @ ipsMgr.AddToList since %s not exist in %s set", listName, setName)
}

// Delete set from list and validate set is not in list anymore.
if err := ipsMgr.DeleteFromList(listName, setName); err != nil {
t.Errorf("TestDeleteFromList failed @ ipsMgr.DeleteFromList")
}
Expand All @@ -144,7 +147,23 @@ func TestDeleteFromList(t *testing.T) {
t.Errorf("TestDeleteFromList failed @ ipsMgr.DeleteFromList since %s still exist in %s set", listName, setName)
}

if err := ipsMgr.DeleteSet("test-set"); err != nil {
// Delete List and validate list is not exist.

if err := ipsMgr.DeleteSet(listName); err != nil {
t.Errorf("TestDeleteSet failed @ ipsMgr.DeleteSet")
}

entry = &ipsEntry{
operationFlag: util.IPsetCheckListFlag,
set: util.GetHashedName(listName),
}

if _, err := ipsMgr.Run(entry); err == nil {
t.Errorf("TestDeleteFromList failed @ ipsMgr.DeleteSet since %s still exist in kernel", listName)
}

// Delete set and validate set is not exist.
if err := ipsMgr.DeleteSet(setName); err != nil {
t.Errorf("TestDeleteSet failed @ ipsMgr.DeleteSet")
}

Expand All @@ -154,7 +173,7 @@ func TestDeleteFromList(t *testing.T) {
}

if _, err := ipsMgr.Run(entry); err == nil {
t.Errorf("TestDeleteFromList failed @ ipsMgr.CreateSet since %s still exist in kernel", setName)
t.Errorf("TestDeleteFromList failed @ ipsMgr.DeleteSet since %s still exist in kernel", setName)
}
}

Expand Down