Browse code
Merge pull request #35982 from cpuguy83/fix_concurrent_daemon_test_issues
Fix race with concurrent daemon startup in tests
Brian Goff authored on 2018/01/12 04:26:35Showing 1 changed files
| ... | ... |
@@ -59,9 +59,9 @@ func TestDaemonRestartKillContainers(t *testing.T) {
|
| 59 | 59 |
t.Fatal(err) |
| 60 | 60 |
} |
| 61 | 61 |
|
| 62 |
- var args []string |
|
| 62 |
+ args := []string{"--iptables=false"}
|
|
| 63 | 63 |
if liveRestoreEnabled {
|
| 64 |
- args = []string{"--live-restore"}
|
|
| 64 |
+ args = append(args, "--live-restore") |
|
| 65 | 65 |
} |
| 66 | 66 |
|
| 67 | 67 |
d.StartWithBusybox(t, args...) |