From fce90b07ece374e4e73011e2f99759bf1df7dee7 Mon Sep 17 00:00:00 2001 From: Benjamin Ullian Date: Tue, 4 May 2021 15:41:55 -0400 Subject: [PATCH] Oops, i guess my unit test was flaky in #1068 --- pkg/utils/ipset.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/utils/ipset.go b/pkg/utils/ipset.go index 35037140..c6cd61e4 100644 --- a/pkg/utils/ipset.go +++ b/pkg/utils/ipset.go @@ -447,7 +447,13 @@ func buildIPSetRestore(ipset *IPSet) string { ipSetRestore.WriteString(fmt.Sprintf("flush %s\n", tmpSetName)) } + setsToDestroy := make([]string, 0, len(tmpSets)) for _, tmpSetName := range tmpSets { + setsToDestroy = append(setsToDestroy, tmpSetName) + } + // need to destroy the sets in a predictable order for unit test! + sort.Strings(setsToDestroy) + for _, tmpSetName := range setsToDestroy { // finally, destroy the tmp sets. ipSetRestore.WriteString(fmt.Sprintf("destroy %s\n", tmpSetName)) }