github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-07-12 14:08:37 +00:00
Code Issues Projects Releases Wiki Activity

Move skopeoBinary check from *Suite.SetUpTest to SetUpSuite

Browse Source 
The results are not going to vary across individual tests, so let’s only
check once.
This commit is contained in:
Miloslav Trmač 2017-05-10 14:02:11 +02:00
parent 5a42657cdb
commit 9985f12cd4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
integration/check_test.go
View File

@ -34,7 +34,8 @@ type SkopeoSuite struct {
} }
func (s *SkopeoSuite) SetUpSuite(c *check.C) { func (s *SkopeoSuite) SetUpSuite(c *check.C) {
_, err := exec.LookPath(skopeoBinary)
c.Assert(err, check.IsNil)
} }
func (s *SkopeoSuite) TearDownSuite(c *check.C) { 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) { 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.regV1 = setupRegistryV1At(c, privateRegistryURL0, false) // TODO:(runcom)
s.regV2 = setupRegistryV2At(c, privateRegistryURL1, false, false) s.regV2 = setupRegistryV2At(c, privateRegistryURL1, false, false)
s.regV2Shema1 = setupRegistryV2At(c, privateRegistryURL2, false, true) s.regV2Shema1 = setupRegistryV2At(c, privateRegistryURL2, false, true)

8
integration/signing_test.go
View File

@ -36,6 +36,11 @@ func findFingerprint(lineBytes []byte) (string, error) {
return "", errors.New("No fingerprint found") 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) { func (s *SigningSuite) SetUpTest(c *check.C) {
mech, _, err := signature.NewEphemeralGPGSigningMechanism([]byte{}) mech, _, err := signature.NewEphemeralGPGSigningMechanism([]byte{})
c.Assert(err, check.IsNil) 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)) 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") s.gpgHome, err = ioutil.TempDir("", "skopeo-gpg")
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
os.Setenv("GNUPGHOME", s.gpgHome) os.Setenv("GNUPGHOME", s.gpgHome)