github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 12:15:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #94534 from knight42/fix/TestRestoreAllGrabOldLock

Browse Source 
test(iptables): deflake TestRestoreAllGrabOldLock
This commit is contained in:
Kubernetes Prow Robot 2020-09-04 12:39:40 -07:00 committed by GitHub
commit 4dabc3ddc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/util/iptables/iptables_test.go
View File

@ -26,9 +26,11 @@ import (
"reflect"
"strings"
"testing"
"time"
"k8s.io/apimachinery/pkg/util/sets"
utilversion "k8s.io/apimachinery/pkg/util/version"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/utils/exec"
fakeexec "k8s.io/utils/exec/testing"
)
@ -1109,11 +1111,23 @@ func TestRestoreAllGrabOldLock(t *testing.T) {
runner := newInternal(&fexec, ProtocolIPv4, TestLockfilePath)
defer os.Remove(TestLockfilePath)
// Grab the abstract @xtables socket
runLock, err := net.ListenUnix("unix", &net.UnixAddr{Name: "@xtables", Net: "unix"})
var runLock *net.UnixListener
// Grab the abstract @xtables socket, will retry if the socket exists
err := wait.PollImmediate(time.Second, wait.ForeverTestTimeout, func() (done bool, err error) {
runLock, err = net.ListenUnix("unix", &net.UnixAddr{Name: "@xtables", Net: "unix"})
if err != nil {
t.Logf("Failed to lock @xtables: %v, will retry.", err)
return false, nil
}
return true, nil
})
if err != nil {
t.Fatalf("expected to lock @xtables, got %v", err)
t.Fatal("Timed out locking @xtables")
}
if runLock == nil {
t.Fatal("Unexpected nil runLock")
}
defer runLock.Close()
err = runner.RestoreAll([]byte{}, NoFlushTables, RestoreCounters)