From b5be5aca062b5a2bbbb7ae4c324069a693aa3e62 Mon Sep 17 00:00:00 2001 From: Soshi Katsuta Date: Wed, 19 Aug 2015 15:17:33 +0900 Subject: [PATCH] integration-cli: use c.Assert(err, check.IsNil) instead of if err != nil Signed-off-by: Soshi Katsuta Upstream-commit: a41f431d118291c47344b6f2599f0a8c5b272f5a Component: engine --- .../engine/integration-cli/docker_cli_build_test.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/components/engine/integration-cli/docker_cli_build_test.go b/components/engine/integration-cli/docker_cli_build_test.go index 409132c71d..bf7de304c5 100644 --- a/components/engine/integration-cli/docker_cli_build_test.go +++ b/components/engine/integration-cli/docker_cli_build_test.go @@ -5461,13 +5461,9 @@ func (s *DockerSuite) TestBuildNullStringInAddCopyVolume(c *check.C) { "nullfile": "test2", }, ) - - if err != nil { - c.Fatal(err) - } defer ctx.Close() + c.Assert(err, check.IsNil) - if _, err := buildImageFromContext(name, ctx, true); err != nil { - c.Fatal(err) - } + _, err = buildImageFromContext(name, ctx, true) + c.Assert(err, check.IsNil) }