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)