diff options
author | Fabian Groffen <grobian@gentoo.org> | 2019-05-25 17:34:51 +0200 |
---|---|---|
committer | Fabian Groffen <grobian@gentoo.org> | 2019-05-25 17:34:51 +0200 |
commit | 06d6dd34b03439b7b85938f2da655c42884fe72e (patch) | |
tree | 71367fb0a701801f7fa27cf734b5f7c6c3b300d8 | |
parent | travis: try switching to a more recent ubuntu (diff) | |
download | portage-utils-06d6dd34.tar.gz portage-utils-06d6dd34.tar.bz2 portage-utils-06d6dd34.zip |
tests/qmanifest: switch to reconstructing gpg keyring
debuntu/travis apparently comes with a prehistoric version of gpg, so
let's see if the key format is compatible.
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
-rwxr-xr-x | tests/qmanifest/dotest | 11 | ||||
-rw-r--r-- | tests/qmanifest/key.gpg | bin | 0 -> 2607 bytes | |||
-rw-r--r-- | tests/qmanifest/manifestp6.good | 2 | ||||
-rw-r--r-- | tests/qmanifest/root/.gnupg/private-keys-v1.d/1F0A2C7F1E80A6EEEA3B9C30068FB3349702B3A7.key | bin | 1171 -> 0 bytes | |||
-rw-r--r-- | tests/qmanifest/root/.gnupg/private-keys-v1.d/E37F9F3C8E4A940C625EC65B7070255F4AAA55F9.key | bin | 1155 -> 0 bytes | |||
-rw-r--r-- | tests/qmanifest/root/.gnupg/pubring.kbx | bin | 1435 -> 0 bytes | |||
-rw-r--r-- | tests/qmanifest/root/.gnupg/random_seed | bin | 600 -> 0 bytes | |||
-rw-r--r-- | tests/qmanifest/root/.gnupg/trustdb.gpg | bin | 1280 -> 0 bytes |
8 files changed, 10 insertions, 3 deletions
diff --git a/tests/qmanifest/dotest b/tests/qmanifest/dotest index 177a9134..549223ba 100755 --- a/tests/qmanifest/dotest +++ b/tests/qmanifest/dotest @@ -46,11 +46,18 @@ test 05 1 "qmanifest -o notatree" rm -Rf testtree cp -r "${ROOT}/simpletree" testtree || echo try it anyway export HOME=$(mktemp -d) # for gnupg home -cp -r "${ROOT}/.gnupg" "${HOME}/" +mkdir "${HOME}"/.gnupg # silence gpg warnings chmod -R og-rwx "${HOME}"/.gnupg -# sanity check +# import key and sanity check +echo qmanifest | gpg \ + --batch \ + --quiet \ + --no-tty \ + --passphrase-fd 0 \ + --pinentry-mode loopback \ + --import "${as}"/key.gpg test p6 0 "gpg --list-keys | sed '1,2d'" # make it a fully valid tree diff --git a/tests/qmanifest/key.gpg b/tests/qmanifest/key.gpg Binary files differnew file mode 100644 index 00000000..e1781183 --- /dev/null +++ b/tests/qmanifest/key.gpg diff --git a/tests/qmanifest/manifestp6.good b/tests/qmanifest/manifestp6.good index 6a392a37..ece3fa77 100644 --- a/tests/qmanifest/manifestp6.good +++ b/tests/qmanifest/manifestp6.good @@ -1,5 +1,5 @@ pub rsa2048 2019-05-24 [SC] 3D695C8C0F87966B62DC5AFCDCFABA8E07F52261 -uid [ultimate] Qmanifest Test Key +uid [ unknown] Qmanifest Test Key sub rsa2048 2019-05-24 [E] diff --git a/tests/qmanifest/root/.gnupg/private-keys-v1.d/1F0A2C7F1E80A6EEEA3B9C30068FB3349702B3A7.key b/tests/qmanifest/root/.gnupg/private-keys-v1.d/1F0A2C7F1E80A6EEEA3B9C30068FB3349702B3A7.key Binary files differdeleted file mode 100644 index b4ed7679..00000000 --- a/tests/qmanifest/root/.gnupg/private-keys-v1.d/1F0A2C7F1E80A6EEEA3B9C30068FB3349702B3A7.key +++ /dev/null diff --git a/tests/qmanifest/root/.gnupg/private-keys-v1.d/E37F9F3C8E4A940C625EC65B7070255F4AAA55F9.key b/tests/qmanifest/root/.gnupg/private-keys-v1.d/E37F9F3C8E4A940C625EC65B7070255F4AAA55F9.key Binary files differdeleted file mode 100644 index 4b074015..00000000 --- a/tests/qmanifest/root/.gnupg/private-keys-v1.d/E37F9F3C8E4A940C625EC65B7070255F4AAA55F9.key +++ /dev/null diff --git a/tests/qmanifest/root/.gnupg/pubring.kbx b/tests/qmanifest/root/.gnupg/pubring.kbx Binary files differdeleted file mode 100644 index 848dc936..00000000 --- a/tests/qmanifest/root/.gnupg/pubring.kbx +++ /dev/null diff --git a/tests/qmanifest/root/.gnupg/random_seed b/tests/qmanifest/root/.gnupg/random_seed Binary files differdeleted file mode 100644 index 5da25bd7..00000000 --- a/tests/qmanifest/root/.gnupg/random_seed +++ /dev/null diff --git a/tests/qmanifest/root/.gnupg/trustdb.gpg b/tests/qmanifest/root/.gnupg/trustdb.gpg Binary files differdeleted file mode 100644 index 78308c62..00000000 --- a/tests/qmanifest/root/.gnupg/trustdb.gpg +++ /dev/null |