From 02b9363233fb6a5f2919f43e48a4095cc8e5a2df Mon Sep 17 00:00:00 2001 From: Guillaume Tardif Date: Mon, 19 Apr 2021 16:52:14 +0200 Subject: [PATCH] avoid assertions in defer statements. Signed-off-by: Guillaume Tardif --- local/e2e/compose/compose_test.go | 4 ++-- local/e2e/compose/scan_message_test.go | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/local/e2e/compose/compose_test.go b/local/e2e/compose/compose_test.go index b65f7579d..d65adc237 100644 --- a/local/e2e/compose/compose_test.go +++ b/local/e2e/compose/compose_test.go @@ -145,7 +145,7 @@ func TestAttachRestart(t *testing.T) { c := NewParallelE2eCLI(t, binDir) res := c.RunDockerOrExitError("compose", "--ansi=never", "--project-directory", "./fixtures/attach-restart", "up") - defer c.RunDockerCmd("compose", "-p", "attach-restart", "down") + defer c.RunDockerOrExitError("compose", "-p", "attach-restart", "down") output := res.Stdout() exitRegex := regexp.MustCompile("another_1 exited with code 1") @@ -159,7 +159,7 @@ func TestInitContainer(t *testing.T) { c := NewParallelE2eCLI(t, binDir) res := c.RunDockerOrExitError("compose", "--ansi=never", "--project-directory", "./fixtures/init-container", "up") - defer c.RunDockerCmd("compose", "-p", "init-container", "down") + defer c.RunDockerOrExitError("compose", "-p", "init-container", "down") output := res.Stdout() assert.Assert(t, strings.Contains(output, "foo_1 | hello\nbar_1 | world"), res.Combined()) diff --git a/local/e2e/compose/scan_message_test.go b/local/e2e/compose/scan_message_test.go index be87c68b6..9c0db2507 100644 --- a/local/e2e/compose/scan_message_test.go +++ b/local/e2e/compose/scan_message_test.go @@ -42,23 +42,23 @@ func TestDisplayScanMessageAfterBuild(t *testing.T) { t.Run("display when docker build", func(t *testing.T) { res := c.RunDockerCmd("build", "-t", "test-image-scan-msg", "./fixtures/simple-build-test/nginx-build") - defer c.RunDockerCmd("rmi", "-f", "test-image-scan-msg") + defer c.RunDockerOrExitError("rmi", "-f", "test-image-scan-msg") res.Assert(t, icmd.Expected{Err: "Use 'docker scan' to run Snyk tests against images to find vulnerabilities and learn how to fix them"}) }) t.Run("do not display with docker build and quiet flag", func(t *testing.T) { res := c.RunDockerCmd("build", "-t", "test-image-scan-msg-quiet", "--quiet", "./fixtures/simple-build-test/nginx-build") - defer c.RunDockerCmd("rmi", "-f", "test-image-scan-msg-quiet") + defer c.RunDockerOrExitError("rmi", "-f", "test-image-scan-msg-quiet") assert.Assert(t, !strings.Contains(res.Combined(), "docker scan")) res = c.RunDockerCmd("build", "-t", "test-image-scan-msg-q", "-q", "./fixtures/simple-build-test/nginx-build") - defer c.RunDockerCmd("rmi", "-f", "test-image-scan-msg-q") + defer c.RunDockerOrExitError("rmi", "-f", "test-image-scan-msg-q") assert.Assert(t, !strings.Contains(res.Combined(), "docker scan")) }) t.Run("do not display if envvar DOCKER_SCAN_SUGGEST=false", func(t *testing.T) { cmd := c.NewDockerCmd("build", "-t", "test-image-scan-msg", "./fixtures/build-test/nginx-build") - defer c.RunDockerCmd("rmi", "-f", "test-image-scan-msg") + defer c.RunDockerOrExitError("rmi", "-f", "test-image-scan-msg") cmd.Env = append(cmd.Env, "DOCKER_SCAN_SUGGEST=false") res := icmd.StartCmd(cmd) assert.Assert(t, !strings.Contains(res.Combined(), "docker scan"), res.Combined()) @@ -66,7 +66,7 @@ func TestDisplayScanMessageAfterBuild(t *testing.T) { t.Run("display on compose build", func(t *testing.T) { res := c.RunDockerCmd("compose", "-f", "./fixtures/simple-build-test/compose.yml", "-p", "scan-msg-test-compose-build", "build") - defer c.RunDockerCmd("rmi", "-f", "scan-msg-test-compose-build_nginx") + defer c.RunDockerOrExitError("rmi", "-f", "scan-msg-test-compose-build_nginx") res.Assert(t, icmd.Expected{Err: "Use 'docker scan' to run Snyk tests against images to find vulnerabilities and learn how to fix them"}) }) @@ -77,7 +77,7 @@ func TestDisplayScanMessageAfterBuild(t *testing.T) { assert.Assert(t, !strings.Contains(res.Combined(), "No such image")) res = c.RunDockerCmd("compose", "-f", "./fixtures/simple-build-test/compose.yml", "-p", "scan-msg-test-q", "build", "-q") - defer c.RunDockerCmd("rmi", "-f", "scan-msg-test-q_nginx") + defer c.RunDockerOrExitError("rmi", "-f", "scan-msg-test-q_nginx") assert.Assert(t, !strings.Contains(res.Combined(), "docker scan"), res.Combined()) }) @@ -85,13 +85,13 @@ func TestDisplayScanMessageAfterBuild(t *testing.T) { t.Run("display on compose up if image is built", func(t *testing.T) { res := c.RunDockerCmd("compose", "-f", "./fixtures/simple-build-test/compose.yml", "-p", "scan-msg-test", "up", "-d") - defer c.RunDockerCmd("compose", "-f", "./fixtures/simple-build-test/compose.yml", "-p", "scan-msg-test", "down") + defer c.RunDockerOrExitError("compose", "-f", "./fixtures/simple-build-test/compose.yml", "-p", "scan-msg-test", "down") res.Assert(t, icmd.Expected{Err: "Use 'docker scan' to run Snyk tests against images to find vulnerabilities and learn how to fix them"}) }) t.Run("do not display on compose up if no image built", func(t *testing.T) { // re-run the same Compose aproject res := c.RunDockerCmd("compose", "-f", "./fixtures/simple-build-test/compose.yml", "-p", "scan-msg-test", "up", "-d") - defer c.RunDockerCmd("compose", "-f", "./fixtures/simple-build-test/compose.yml", "-p", "scan-msg-test", "down", "--rmi", "all") + defer c.RunDockerOrExitError("compose", "-f", "./fixtures/simple-build-test/compose.yml", "-p", "scan-msg-test", "down", "--rmi", "all") assert.Assert(t, !strings.Contains(res.Combined(), "docker scan"), res.Combined()) })