Merge pull request #35982 from cpuguy83/fix_concurrent_daemon_test_issues
Fix race with concurrent daemon startup in tests
This commit is contained in:
commit
92309e34e4
|
@ -59,9 +59,9 @@ func TestDaemonRestartKillContainers(t *testing.T) {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
var args []string
|
args := []string{"--iptables=false"}
|
||||||
if liveRestoreEnabled {
|
if liveRestoreEnabled {
|
||||||
args = []string{"--live-restore"}
|
args = append(args, "--live-restore")
|
||||||
}
|
}
|
||||||
|
|
||||||
d.StartWithBusybox(t, args...)
|
d.StartWithBusybox(t, args...)
|
||||||
|
|
Loading…
Reference in New Issue