From 9985f12cd4d7d14bcbc31061bde101b5bf29af71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= <mitr@redhat.com>
Date: Wed, 10 May 2017 14:02:11 +0200
Subject: [PATCH] Move skopeoBinary check from *Suite.SetUpTest to SetUpSuite
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The results are not going to vary across individual tests, so let’s only
check once.
---
 integration/check_test.go   | 6 ++----
 integration/signing_test.go | 8 +++++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/integration/check_test.go b/integration/check_test.go
index 173d1788..26080b75 100644
--- a/integration/check_test.go
+++ b/integration/check_test.go
@@ -34,7 +34,8 @@ type SkopeoSuite struct {
 }
 
 func (s *SkopeoSuite) SetUpSuite(c *check.C) {
-
+	_, err := exec.LookPath(skopeoBinary)
+	c.Assert(err, check.IsNil)
 }
 
 func (s *SkopeoSuite) TearDownSuite(c *check.C) {
@@ -42,9 +43,6 @@ func (s *SkopeoSuite) TearDownSuite(c *check.C) {
 }
 
 func (s *SkopeoSuite) SetUpTest(c *check.C) {
-	_, err := exec.LookPath(skopeoBinary)
-	c.Assert(err, check.IsNil)
-
 	s.regV1 = setupRegistryV1At(c, privateRegistryURL0, false) // TODO:(runcom)
 	s.regV2 = setupRegistryV2At(c, privateRegistryURL1, false, false)
 	s.regV2Shema1 = setupRegistryV2At(c, privateRegistryURL2, false, true)
diff --git a/integration/signing_test.go b/integration/signing_test.go
index a0a32afd..b3db0b9c 100644
--- a/integration/signing_test.go
+++ b/integration/signing_test.go
@@ -36,6 +36,11 @@ func findFingerprint(lineBytes []byte) (string, error) {
 	return "", errors.New("No fingerprint found")
 }
 
+func (s *SigningSuite) SetUpSuite(c *check.C) {
+	_, err := exec.LookPath(skopeoBinary)
+	c.Assert(err, check.IsNil)
+}
+
 func (s *SigningSuite) SetUpTest(c *check.C) {
 	mech, _, err := signature.NewEphemeralGPGSigningMechanism([]byte{})
 	c.Assert(err, check.IsNil)
@@ -44,9 +49,6 @@ func (s *SigningSuite) SetUpTest(c *check.C) {
 		c.Skip(fmt.Sprintf("Signing not supported: %v", err))
 	}
 
-	_, err = exec.LookPath(skopeoBinary)
-	c.Assert(err, check.IsNil)
-
 	s.gpgHome, err = ioutil.TempDir("", "skopeo-gpg")
 	c.Assert(err, check.IsNil)
 	os.Setenv("GNUPGHOME", s.gpgHome)