Merge pull request #36567 from kolyshkin/t-parallel

integration/TestContainerShmNoLeak: use --iptables=false
Upstream-commit: 4a65cd4d6d845e895c7c8061080210d74ae5a19b
Component: engine
This commit is contained in:
Brian Goff
2018-03-13 08:36:20 -04:00
committed by GitHub

View File

@ -30,7 +30,7 @@ func TestContainerShmNoLeak(t *testing.T) {
if err != nil {
t.Fatal(err)
}
d.StartWithBusybox(t)
d.StartWithBusybox(t, "--iptables=false")
defer d.Stop(t)
ctx := context.Background()