github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-08-10 10:52:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1391 from mtrmac/lint

Browse Source 
Fix two instances of unused err found by go-staticcheck
This commit is contained in:
Daniel J Walsh 2021-07-29 07:09:17 -04:00 committed by GitHub
commit c27d9063e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
integration/copy_test.go
View File

@ -568,6 +568,7 @@ func (s *CopySuite) TestCopyEncryption(c *check.C) {
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
defer os.RemoveAll(keysDir) defer os.RemoveAll(keysDir)
undecryptedImgDir, err := ioutil.TempDir("", "copy-5") undecryptedImgDir, err := ioutil.TempDir("", "copy-5")
c.Assert(err, check.IsNil)
defer os.RemoveAll(undecryptedImgDir) defer os.RemoveAll(undecryptedImgDir)
multiLayerImageDir, err := ioutil.TempDir("", "copy-6") multiLayerImageDir, err := ioutil.TempDir("", "copy-6")
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)

1
integration/openshift.go
View File

@ -62,6 +62,7 @@ func (cluster *openshiftCluster) startMaster(c *check.C) {
cmd := cluster.clusterCmd(nil, "openshift", "start", "master") cmd := cluster.clusterCmd(nil, "openshift", "start", "master")
cluster.processes = append(cluster.processes, cmd) cluster.processes = append(cluster.processes, cmd)
stdout, err := cmd.StdoutPipe() 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, // 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 // but logging actually goes only to stderr - this primarily ensure we log any
// unexpected output to stdout. // unexpected output to stdout.