diff --git a/helpers/docker/client.go b/helpers/docker/client.go index 357c291e199d000e3eb888fdc2fede87d94c10db..2de1bb612056b398aca9ec0057e5243720aca042 100644 --- a/helpers/docker/client.go +++ b/helpers/docker/client.go @@ -17,7 +17,6 @@ type Client interface { ContainerCreate(ctx context.Context, config *container.Config, hostConfig *container.HostConfig, networkingConfig *network.NetworkingConfig, containerName string) (container.ContainerCreateCreatedBody, error) ContainerStart(ctx context.Context, containerID string, options types.ContainerStartOptions) error - ContainerWait(ctx context.Context, containerID string) (int64, error) ContainerKill(ctx context.Context, containerID, signal string) error ContainerInspect(ctx context.Context, containerID string) (types.ContainerJSON, error) ContainerAttach(ctx context.Context, container string, options types.ContainerAttachOptions) (types.HijackedResponse, error) diff --git a/helpers/docker/mock_Client.go b/helpers/docker/mock_Client.go index b944d426318e0b28e4a9497b1834ee5406b8b7bc..2d6840cc9691fab1f055934ed93c1b5986129c07 100644 --- a/helpers/docker/mock_Client.go +++ b/helpers/docker/mock_Client.go @@ -200,27 +200,6 @@ func (_m *MockClient) ContainerStart(ctx context.Context, containerID string, op return r0 } -// ContainerWait provides a mock function with given fields: ctx, containerID -func (_m *MockClient) ContainerWait(ctx context.Context, containerID string) (int64, error) { - ret := _m.Called(ctx, containerID) - - var r0 int64 - if rf, ok := ret.Get(0).(func(context.Context, string) int64); ok { - r0 = rf(ctx, containerID) - } else { - r0 = ret.Get(0).(int64) - } - - var r1 error - if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { - r1 = rf(ctx, containerID) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - // ImageImportBlocking provides a mock function with given fields: ctx, source, ref, options func (_m *MockClient) ImageImportBlocking(ctx context.Context, source types.ImageImportSource, ref string, options types.ImageImportOptions) error { ret := _m.Called(ctx, source, ref, options) diff --git a/helpers/docker/official_docker_client.go b/helpers/docker/official_docker_client.go index 152e7aad1a5af5bbb2a68b17fc8b864b71a2e98c..2d6900d1f843bde774b890262125472a03a13cfc 100644 --- a/helpers/docker/official_docker_client.go +++ b/helpers/docker/official_docker_client.go @@ -89,12 +89,6 @@ func (c *officialDockerClient) ContainerStart(ctx context.Context, containerID s return wrapError("ContainerCreate", err, started) } -func (c *officialDockerClient) ContainerWait(ctx context.Context, containerID string) (int64, error) { - started := time.Now() - result, err := c.client.ContainerWait(ctx, containerID) - return result, wrapError("ContainerWait", err, started) -} - func (c *officialDockerClient) ContainerKill(ctx context.Context, containerID string, signal string) error { started := time.Now() err := c.client.ContainerKill(ctx, containerID, signal)