From a1f9318e7b49c8f9c0b795dd7022e414da930563 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Wed, 28 Jul 2021 21:46:07 +0200 Subject: [PATCH] Fix two instances of unused err found by go-staticcheck MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit *cough* Go is an easy-to-use, hard-to-misuse language *cough* Signed-off-by: Miloslav Trmač --- integration/copy_test.go | 1 + integration/openshift.go | 1 + 2 files changed, 2 insertions(+) diff --git a/integration/copy_test.go b/integration/copy_test.go index 06b22595..ca04e852 100644 --- a/integration/copy_test.go +++ b/integration/copy_test.go @@ -568,6 +568,7 @@ func (s *CopySuite) TestCopyEncryption(c *check.C) { c.Assert(err, check.IsNil) defer os.RemoveAll(keysDir) undecryptedImgDir, err := ioutil.TempDir("", "copy-5") + c.Assert(err, check.IsNil) defer os.RemoveAll(undecryptedImgDir) multiLayerImageDir, err := ioutil.TempDir("", "copy-6") c.Assert(err, check.IsNil) diff --git a/integration/openshift.go b/integration/openshift.go index 2d5f7662..ffebfefb 100644 --- a/integration/openshift.go +++ b/integration/openshift.go @@ -62,6 +62,7 @@ func (cluster *openshiftCluster) startMaster(c *check.C) { cmd := cluster.clusterCmd(nil, "openshift", "start", "master") cluster.processes = append(cluster.processes, cmd) stdout, err := cmd.StdoutPipe() + c.Assert(err, check.IsNil) // Send both to the same pipe. This might cause the two streams to be mixed up, // but logging actually goes only to stderr - this primarily ensure we log any // unexpected output to stdout.