From c8c1ad748ed093b2dfbaadb7e2c3d58be3b0b88d Mon Sep 17 00:00:00 2001 From: Nick Ethier Date: Fri, 14 Jun 2019 22:32:55 -0400 Subject: [PATCH] docker: fix driver test from changed func args --- drivers/docker/driver_test.go | 2 +- drivers/docker/network.go | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/docker/driver_test.go b/drivers/docker/driver_test.go index 61e7a2b4c..50e6d9778 100644 --- a/drivers/docker/driver_test.go +++ b/drivers/docker/driver_test.go @@ -2230,7 +2230,7 @@ func TestDockerDriver_VolumeError(t *testing.T) { driver := dockerDriverHarness(t, nil) // assert volume error is recoverable - _, err := driver.Impl().(*Driver).createContainer(fakeDockerClient{}, docker.CreateContainerOptions{Config: &docker.Config{}}, cfg) + _, err := driver.Impl().(*Driver).createContainer(fakeDockerClient{}, docker.CreateContainerOptions{Config: &docker.Config{}}, cfg.Image) require.True(t, structs.IsRecoverable(err)) } diff --git a/drivers/docker/network.go b/drivers/docker/network.go index 3293e4ee1..e1be3d1a1 100644 --- a/drivers/docker/network.go +++ b/drivers/docker/network.go @@ -75,6 +75,8 @@ func (d *Driver) DestroyNetwork(allocID string, spec *drivers.NetworkIsolationSp }) } +// createSandboxContainerConfig creates a docker container configuration which +// starts a container with an empty network namespace func (d *Driver) createSandboxContainerConfig(allocID string) (*docker.CreateContainerOptions, error) { return &docker.CreateContainerOptions{