github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-06-24 13:52:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #668 from mtrmac/fedora-30-gpg2

Browse Source 
Explicitly disable encrypting the test GPG key
This commit is contained in:
Miloslav Trmač 2019-06-11 16:50:10 +02:00 committed by GitHub
commit 96be1bb155
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
integration/copy_test.go
View File

@ -14,7 +14,7 @@ import (
"github.com/containers/image/manifest" "github.com/containers/image/manifest"
"github.com/containers/image/signature" "github.com/containers/image/signature"
"github.com/go-check/check" "github.com/go-check/check"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/opencontainers/image-tools/image" "github.com/opencontainers/image-tools/image"
) )
@ -64,7 +64,7 @@ func (s *CopySuite) SetUpSuite(c *check.C) {
os.Setenv("GNUPGHOME", s.gpgHome) os.Setenv("GNUPGHOME", s.gpgHome)
for _, key := range []string{"personal", "official"} { for _, key := range []string{"personal", "official"} {
batchInput := fmt.Sprintf("Key-Type: RSA\nName-Real: Test key - %s\nName-email: %s@example.com\n%%commit\n", batchInput := fmt.Sprintf("Key-Type: RSA\nName-Real: Test key - %s\nName-email: %s@example.com\n%%no-protection\n%%commit\n",
key, key) key, key)
runCommandWithInput(c, batchInput, gpgBinary, "--batch", "--gen-key") runCommandWithInput(c, batchInput, gpgBinary, "--batch", "--gen-key")

2
integration/signing_test.go
View File

@ -44,7 +44,7 @@ func (s *SigningSuite) SetUpSuite(c *check.C) {
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
os.Setenv("GNUPGHOME", s.gpgHome) os.Setenv("GNUPGHOME", s.gpgHome)
runCommandWithInput(c, "Key-Type: RSA\nName-Real: Testing user\n%commit\n", gpgBinary, "--homedir", s.gpgHome, "--batch", "--gen-key") runCommandWithInput(c, "Key-Type: RSA\nName-Real: Testing user\n%no-protection\n%commit\n", gpgBinary, "--homedir", s.gpgHome, "--batch", "--gen-key")
lines, err := exec.Command(gpgBinary, "--homedir", s.gpgHome, "--with-colons", "--no-permission-warning", "--fingerprint").Output() lines, err := exec.Command(gpgBinary, "--homedir", s.gpgHome, "--with-colons", "--no-permission-warning", "--fingerprint").Output()
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)