[gentoo-commits] proj/portage-utils:master commit in: tests/qmanifest/root/.gnupg/private-keys-v1.d/, tests/qmanifest/, ...

[Fabian Groffen]

commit:     06d6dd34b03439b7b85938f2da655c42884fe72e
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat May 25 15:34:51 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat May 25 15:34:51 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=06d6dd34

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 <AT> gentoo.org>

 tests/qmanifest/dotest                                   |  11 +++++++++--
 tests/qmanifest/key.gpg                                  | Bin 0 -> 2607 bytes
 tests/qmanifest/manifestp6.good                          |   2 +-
 .../1F0A2C7F1E80A6EEEA3B9C30068FB3349702B3A7.key         | Bin 1171 -> 0 bytes
 .../E37F9F3C8E4A940C625EC65B7070255F4AAA55F9.key         | Bin 1155 -> 0 bytes
 tests/qmanifest/root/.gnupg/pubring.kbx                  | Bin 1435 -> 0 bytes
 tests/qmanifest/root/.gnupg/random_seed                  | Bin 600 -> 0 bytes
 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 177a913..549223b 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
new file mode 100644
index 0000000..e178118
Binary files /dev/null and b/tests/qmanifest/key.gpg differ

diff --git a/tests/qmanifest/manifestp6.good b/tests/qmanifest/manifestp6.good
index 6a392a3..ece3fa7 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
deleted file mode 100644
index b4ed767..0000000
Binary files a/tests/qmanifest/root/.gnupg/private-keys-v1.d/1F0A2C7F1E80A6EEEA3B9C30068FB3349702B3A7.key and /dev/null differ

diff --git a/tests/qmanifest/root/.gnupg/private-keys-v1.d/E37F9F3C8E4A940C625EC65B7070255F4AAA55F9.key b/tests/qmanifest/root/.gnupg/private-keys-v1.d/E37F9F3C8E4A940C625EC65B7070255F4AAA55F9.key
deleted file mode 100644
index 4b07401..0000000
Binary files a/tests/qmanifest/root/.gnupg/private-keys-v1.d/E37F9F3C8E4A940C625EC65B7070255F4AAA55F9.key and /dev/null differ

diff --git a/tests/qmanifest/root/.gnupg/pubring.kbx b/tests/qmanifest/root/.gnupg/pubring.kbx
deleted file mode 100644
index 848dc93..0000000
Binary files a/tests/qmanifest/root/.gnupg/pubring.kbx and /dev/null differ

diff --git a/tests/qmanifest/root/.gnupg/random_seed b/tests/qmanifest/root/.gnupg/random_seed
deleted file mode 100644
index 5da25bd..0000000
Binary files a/tests/qmanifest/root/.gnupg/random_seed and /dev/null differ

diff --git a/tests/qmanifest/root/.gnupg/trustdb.gpg b/tests/qmanifest/root/.gnupg/trustdb.gpg
deleted file mode 100644
index 78308c6..0000000
Binary files a/tests/qmanifest/root/.gnupg/trustdb.gpg and /dev/null differ