From 6aadd436a9777725a392f79c0660631bc65b4c76 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Mon, 5 Aug 2019 17:41:46 -0700 Subject: [PATCH] integration-cli: TestBuildAddBadLinks, TestBuildAddBadLinksVolume: simplify check This fixes the following lint warning: > integration-cli/docker_cli_build_test.go:1001:59: nilness: tautological condition: non-nil != nil (govet) > if _, err := os.Stat(nonExistingFile); err == nil || err != nil && !os.IsNotExist(err) { > ^ Signed-off-by: Kir Kolyshkin Signed-off-by: Sebastiaan van Stijn --- integration-cli/docker_cli_build_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go index b302ec72e8..6ecfce4ed1 100644 --- a/integration-cli/docker_cli_build_test.go +++ b/integration-cli/docker_cli_build_test.go @@ -998,7 +998,7 @@ func (s *DockerSuite) TestBuildAddBadLinks(c *testing.T) { } buildImageSuccessfully(c, name, build.WithExternalBuildContext(ctx)) - if _, err := os.Stat(nonExistingFile); err == nil || err != nil && !os.IsNotExist(err) { + if _, err := os.Stat(nonExistingFile); err == nil || !os.IsNotExist(err) { c.Fatalf("%s shouldn't have been written and it shouldn't exist", nonExistingFile) } @@ -1039,7 +1039,7 @@ func (s *DockerSuite) TestBuildAddBadLinksVolume(c *testing.T) { } buildImageSuccessfully(c, "test-link-absolute-volume", build.WithExternalBuildContext(ctx)) - if _, err := os.Stat(nonExistingFile); err == nil || err != nil && !os.IsNotExist(err) { + if _, err := os.Stat(nonExistingFile); err == nil || !os.IsNotExist(err) { c.Fatalf("%s shouldn't have been written and it shouldn't exist", nonExistingFile) }