From 521e3ce0eb5eed3e40919cc594472975f5861c92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Sat, 21 May 2016 04:46:57 +0200 Subject: [PATCH 1/2] Remove duplicated test --- integration/signing_test.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/integration/signing_test.go b/integration/signing_test.go index 35c36469..47de0dcd 100644 --- a/integration/signing_test.go +++ b/integration/signing_test.go @@ -59,8 +59,6 @@ func ConsumeAndLogOutput(c *check.C, id string, f io.ReadCloser, err error) { func (s *SigningSuite) SetUpTest(c *check.C) { _, err := exec.LookPath(skopeoBinary) c.Assert(err, check.IsNil) - _, err = exec.LookPath(skopeoBinary) - c.Assert(err, check.IsNil) s.gpgHome, err = ioutil.TempDir("", "skopeo-gpg") c.Assert(err, check.IsNil) From 09f33a7c2c54b6e5335459d491d0ee0ff59f8c42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Sat, 21 May 2016 04:48:33 +0200 Subject: [PATCH 2/2] Remove a redundant check reference.WithDefaultTag is already calling reference.IsNameOnly, so we don't need to guard it on the outside. --- docker/docker_utils.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docker/docker_utils.go b/docker/docker_utils.go index 06210e23..5a46dce9 100644 --- a/docker/docker_utils.go +++ b/docker/docker_utils.go @@ -8,9 +8,7 @@ func parseDockerImageName(img string) (reference.Named, string, error) { if err != nil { return nil, "", err } - if reference.IsNameOnly(ref) { - ref = reference.WithDefaultTag(ref) - } + ref = reference.WithDefaultTag(ref) var tag string switch x := ref.(type) { case reference.Canonical: