From f1d9b2cb657e56ec0751b69362a1ed78dd2d6488 Mon Sep 17 00:00:00 2001 From: Diptanu Choudhury Date: Fri, 25 Mar 2016 17:02:53 -0700 Subject: [PATCH] Removing the container after running script check --- client/driver/executor/checks_test.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/client/driver/executor/checks_test.go b/client/driver/executor/checks_test.go index edeebf825..0bdaa2a70 100644 --- a/client/driver/executor/checks_test.go +++ b/client/driver/executor/checks_test.go @@ -119,6 +119,7 @@ func TestDockerScriptCheck(t *testing.T) { if err != nil { t.Fatalf("error creating container: %v", err) } + defer removeContainer(client, container.ID) if err := client.StartContainer(container.ID, &docker.HostConfig{}); err != nil { t.Fatalf("error starting container", err) @@ -147,3 +148,9 @@ func TestDockerScriptCheck(t *testing.T) { t.Fatalf("exitcode expected: %v, actual: %v", expectedExitCode, res.ExitCode) } } + +// removeContainer kills and removes a container +func removeContainer(client *docker.Client, containerID string) { + client.KillContainer(docker.KillContainerOptions{ID: containerID}) + client.RemoveContainer(docker.RemoveContainerOptions{ID: containerID, Force: true}) +}