Merge pull request #35982 from cpuguy83/fix_concurrent_daemon_test_issues

Fix race with concurrent daemon startup in tests
This commit is contained in:
Brian Goff 2018-01-11 14:26:35 -05:00 committed by GitHub
commit 92309e34e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions

View File

@ -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...)