From 34d03cce571653366fb4631e8911ec657a7d1613 Mon Sep 17 00:00:00 2001 From: Guillaume Tardif Date: Thu, 18 Mar 2021 17:03:53 +0100 Subject: [PATCH] Cleanup remaining containers after compose e2e tests Signed-off-by: Guillaume Tardif --- local/e2e/compose/compose_run_test.go | 9 +++++++-- local/e2e/compose/compose_test.go | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/local/e2e/compose/compose_run_test.go b/local/e2e/compose/compose_run_test.go index 59fb75e94..e46e9dd16 100644 --- a/local/e2e/compose/compose_run_test.go +++ b/local/e2e/compose/compose_run_test.go @@ -35,7 +35,6 @@ func TestLocalComposeRun(t *testing.T) { lines := Lines(res.Stdout()) assert.Equal(t, lines[len(lines)-1], "Hello there!!", res.Stdout()) assert.Assert(t, !strings.Contains(res.Combined(), "orphan")) - res = c.RunDockerCmd("compose", "-f", "./fixtures/run-test/compose.yml", "run", "back", "echo", "Hello one more time") lines = Lines(res.Stdout()) assert.Equal(t, lines[len(lines)-1], "Hello one more time", res.Stdout()) @@ -96,8 +95,14 @@ func TestLocalComposeRun(t *testing.T) { }) t.Run("compose run --publish", func(t *testing.T) { - c.RunDockerCmd("compose", "-f", "./fixtures/run-test/compose.yml", "run", "--rm", "--publish", "8080:80", "-d", "back", "/bin/sh", "-c", "sleep 10") + c.RunDockerCmd("compose", "-f", "./fixtures/run-test/compose.yml", "run", "--publish", "8080:80", "-d", "back", "/bin/sh", "-c", "sleep 1") res := c.RunDockerCmd("ps") assert.Assert(t, strings.Contains(res.Stdout(), "8080->80/tcp"), res.Stdout()) }) + + t.Run("down", func(t *testing.T) { + c.RunDockerCmd("compose", "-f", "./fixtures/run-test/compose.yml", "down") + res := c.RunDockerCmd("ps", "--all") + assert.Assert(t, !strings.Contains(res.Stdout(), "run-test"), res.Stdout()) + }) } diff --git a/local/e2e/compose/compose_test.go b/local/e2e/compose/compose_test.go index f731c41f1..079acbed9 100644 --- a/local/e2e/compose/compose_test.go +++ b/local/e2e/compose/compose_test.go @@ -137,7 +137,8 @@ func TestComposePull(t *testing.T) { func TestAttachRestart(t *testing.T) { c := NewParallelE2eCLI(t, binDir) - res := c.RunDockerOrExitError("compose", "--ansi=never", "--project-directory", "fixtures/attach-restart", "up") + res := c.RunDockerOrExitError("compose", "--ansi=never", "--project-directory", "./fixtures/attach-restart", "up") + defer c.RunDockerCmd("compose", "-p", "attach-restart", "down") output := res.Stdout() exitRegex := regexp.MustCompile("another_1 exited with code 1")