[gentoo-commits] proj/portage-utils:master commit in: tests/qmanifest/

[gentoo-commits] proj/portage-utils:master commit in: tests/qmanifest/

[Fabian Groffen]

commit:     a6267f74a20233bd45161370558ce0a11b47dca8
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat May 25 15:55:12 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat May 25 15:55:12 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=a6267f74

tests/qmanifest: forgot about set -e, work around it

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 tests/qmanifest/dotest | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/qmanifest/dotest b/tests/qmanifest/dotest
index a6b1431..abab463 100755
--- a/tests/qmanifest/dotest
+++ b/tests/qmanifest/dotest
@@ -63,11 +63,10 @@ gpg_import() {
 	local killpinentry="--pinentry-mode loopback"
 
 	# see if gpg is new enough for killpinentry
-	echo "${pass}" | gpg -n ${killpinentry} "${args[@]}"
-	if [[ $? -ne 0 ]] ; then
-		echo "${pass}" | gpg "${args[@]}"
-	else
+	if echo "${pass}" | gpg -n ${killpinentry} "${args[@]}" ; then
 		echo "${pass}" | gpg ${killpinentry} "${args[@]}"
+	else
+		echo "${pass}" | gpg "${args[@]}"
 	fi
 }
 # import key and sanity check

[gentoo-commits] proj/portage-utils:master commit in: tests/qmanifest/

[Fabian Groffen]

commit:     6886e365b76c8555260d79a9d4cc3b7f1d658cb0
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 15 09:39:27 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec 15 09:39:27 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=6886e365

tests/qmanifest: add some debugging for #701402

Bug: https://bugs.gentoo.org/701402
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 tests/qmanifest/dotest | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/qmanifest/dotest b/tests/qmanifest/dotest
index 900b9ea..4031c8b 100755
--- a/tests/qmanifest/dotest
+++ b/tests/qmanifest/dotest
@@ -25,6 +25,7 @@ test() {
 }
 
 # verify we see our overlays
+DEBUG=1 q -ev
 test 00 0 "q -o"
 
 # simple run check (should do bad_tree)

[gentoo-commits] proj/portage-utils:master commit in: tests/qmanifest/

[Fabian Groffen]

commit:     3f59ae89004adfb1c6111acee7197758722ae69b
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 13 11:31:33 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jun 13 11:31:33 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=3f59ae89

tests/qmanifest: allow gpg_import to fail

bash on Travis responds differently (more correct?) than bash on my test
env, disable error-is-fail behaviour for the test

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 tests/qmanifest/dotest | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/qmanifest/dotest b/tests/qmanifest/dotest
index 0770ed1..900b9ea 100755
--- a/tests/qmanifest/dotest
+++ b/tests/qmanifest/dotest
@@ -69,7 +69,9 @@ gpg_import() {
 # - Ubuntu uses old/ancient gnupg which doesn't grok arguments and key (Travis)
 # - HOME (T) may be too long to hold a socket, especially on Linux this
 #   pathlength is very short, Portage's T may be too long by default
+set +e
 if gpg_import "${as}"/key.gpg qmanifest ; then
+set -e
 
 # make it a fully valid tree
 rm testtree/my-cat/mypackage/unrecorded-file

[gentoo-commits] proj/portage-utils:master commit in: tests/qmanifest/

[Fabian Groffen]

commit:     bcbcec8baad9790b8df4da526ad2d0cdd9f13fd1
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 13 11:24:22 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jun 13 11:24:22 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=bcbcec8b

tests/qmanifest: skip sign test if importing key fails

gnupg's socket path may be too long due to T being somewhere too deep,
so simply skip the signing test in that case

Bug: https://bugs.gentoo.org/687982
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 tests/qmanifest/dotest          | 21 ++++++++++-----------
 tests/qmanifest/manifest01.good |  8 ++++----
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/tests/qmanifest/dotest b/tests/qmanifest/dotest
index 525dc8b..0770ed1 100755
--- a/tests/qmanifest/dotest
+++ b/tests/qmanifest/dotest
@@ -42,15 +42,11 @@ test 04 1 "qmanifest -d not_a_tree"
 # overlay test
 test 05 1 "qmanifest -o notatree"
 
-# Travis uses old Ubuntu, and Ubuntu uses prehistoric gpg, which just
-# won't work.  Too bad, really.
-if [[ ${TRAVIS_OS_NAME} != linux ]] ; then
-
 # generate a valid tree
 rm -Rf testtree
 cp -r "${ROOT}/simpletree" testtree || echo try it anyway
-export HOME=$(mktemp -d)  # for gnupg home
-mkdir "${HOME}"/.gnupg
+export HOME=${PWD}  # for gpgme/gnupg home
+mkdir -p "${HOME}"/.gnupg
 # silence gpg warnings
 chmod -R og-rwx "${HOME}"/.gnupg
 
@@ -68,8 +64,12 @@ gpg_import() {
 
 	echo "${pass}" | gpg "${args[@]}"
 }
-# import key
-gpg_import "${as}"/key.gpg qmanifest
+# import key, if this fails, skip the test, couple of reasons why this
+# could fail:
+# - Ubuntu uses old/ancient gnupg which doesn't grok arguments and key (Travis)
+# - HOME (T) may be too long to hold a socket, especially on Linux this
+#   pathlength is very short, Portage's T may be too long by default
+if gpg_import "${as}"/key.gpg qmanifest ; then
 
 # make it a fully valid tree
 rm testtree/my-cat/mypackage/unrecorded-file
@@ -85,11 +85,10 @@ test 06 0 "echo ${KEYPASS} | qmanifest -g -s ${SIGNAS} -p testtree"
 rm -f gpgme.log
 test 07 0 "qmanifest testtree | sed -e '/Manifest timestamp/d' -e 's/made .* UTC by/made by/'"
 
+fi  # gpgimport
+
 # shut down agents and whatnot
 gpgconf --kill all
-rm -Rf "${HOME}"
-
-fi  # TRAVIS_OS_NAME==Linux
 
 cleantmpdir
 

diff --git a/tests/qmanifest/manifest01.good b/tests/qmanifest/manifest01.good
index a9a087a..f97cced 100644
--- a/tests/qmanifest/manifest01.good
+++ b/tests/qmanifest/manifest01.good
@@ -8,12 +8,12 @@ my-cat/mypackage/Manifest::mypackage-1.ebuild:
   expected: 237
 my-cat/mypackage/Manifest::mypackage-2.ebuild:
 - BLAKE2B hash mismatch
-  computed: '2bcad0952735a0a5bf631fe1c65b...ea81babd2a90f3076daa1e6e62ecf042a0b'
-  Manifest: '2410d545e7441e6402c32ca3ce7e...9fb575bd6f74e7cd92e125181af722500a3'
+  computed: '2bcad0952735a0a5bf631fe1c65bc6eb96eb5511f52850e55a8ad9b80480a37ea4a4b01fc6f4f7ccd94942536be3cea81babd2a90f3076daa1e6e62ecf042a0b'
+  Manifest: '2410d545e7441e6402c32ca3ce7e80d6eda82306db1c7d9732ed35d273a20f0983a4a40b02492fbad4145cc776f249fb575bd6f74e7cd92e125181af722500a3'
 my-cat/mypackage/Manifest::mypackage-2.ebuild:
 - SHA512 hash mismatch
-  computed: 'baf9a3bf09b590997d77db13d171...548c3403ac9b2dc22cb78a3112305a68889'
-  Manifest: 'b22f73bd10773a7b01456a237b52...62307fba13d8b04988c5aeb417f2e286d61'
+  computed: 'baf9a3bf09b590997d77db13d171e9b104e8acd3687b5be9a8734f0d4680bc4c34f5d0612ba11c6f5d2d34e9b659f548c3403ac9b2dc22cb78a3112305a68889'
+  Manifest: 'b22f73bd10773a7b01456a237b5224226c4178cc0755d0e84c8b8597071683b148f3b9f56d8b5c7fb8e58f7e618fd62307fba13d8b04988c5aeb417f2e286d61'
 my-cat/mypackage/Manifest::mypackage-3.ebuild:
 - DATA file listed in Manifest, but not found
 my-cat/mypackage/Manifest:

[gentoo-commits] proj/portage-utils:master commit in: tests/qmanifest/

[Fabian Groffen]

commit:     f75ba72b67be73d847a8937e3cd4bdbf3e4777f4
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat May 25 17:05:30 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat May 25 17:05:30 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=f75ba72b

tests/qmanifest: TRAVIS_OS_NAME != $(uname)

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 tests/qmanifest/dotest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/qmanifest/dotest b/tests/qmanifest/dotest
index fcb5bf0..525dc8b 100755
--- a/tests/qmanifest/dotest
+++ b/tests/qmanifest/dotest
@@ -44,7 +44,7 @@ test 05 1 "qmanifest -o notatree"
 
 # Travis uses old Ubuntu, and Ubuntu uses prehistoric gpg, which just
 # won't work.  Too bad, really.
-if [[ ${TRAVIS_OS_NAME} != Linux ]] ; then
+if [[ ${TRAVIS_OS_NAME} != linux ]] ; then
 
 # generate a valid tree
 rm -Rf testtree

[gentoo-commits] proj/portage-utils:master commit in: tests/qmanifest/

[Fabian Groffen]

commit:     5b2115597e4143cea0eef2aa7b3a062ddb122073
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat May 25 16:57:38 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat May 25 16:57:38 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=5b211559

tests/qmanifest: give up on Travis

Debuntu is just toooooooo old.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 tests/qmanifest/dotest | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/tests/qmanifest/dotest b/tests/qmanifest/dotest
index 9587141..fcb5bf0 100755
--- a/tests/qmanifest/dotest
+++ b/tests/qmanifest/dotest
@@ -42,6 +42,10 @@ test 04 1 "qmanifest -d not_a_tree"
 # overlay test
 test 05 1 "qmanifest -o notatree"
 
+# Travis uses old Ubuntu, and Ubuntu uses prehistoric gpg, which just
+# won't work.  Too bad, really.
+if [[ ${TRAVIS_OS_NAME} != Linux ]] ; then
+
 # generate a valid tree
 rm -Rf testtree
 cp -r "${ROOT}/simpletree" testtree || echo try it anyway
@@ -58,16 +62,11 @@ gpg_import() {
 		--quiet
 		--no-tty
 		--passphrase-fd 0
+		--pinentry-mode loopback
 		--import "${key}"
 	)
-	local killpinentry="--pinentry-mode loopback"
 
-	# see if gpg is new enough for killpinentry
-	if echo "${pass}" | gpg -n ${killpinentry} "${args[@]}" ; then
-		echo "${pass}" | gpg ${killpinentry} "${args[@]}"
-	else
-		echo "${pass}" | gpg "${args[@]}"
-	fi
+	echo "${pass}" | gpg "${args[@]}"
 }
 # import key
 gpg_import "${as}"/key.gpg qmanifest
@@ -90,6 +89,8 @@ test 07 0 "qmanifest testtree | sed -e '/Manifest timestamp/d' -e 's/made .* UTC
 gpgconf --kill all
 rm -Rf "${HOME}"
 
+fi  # TRAVIS_OS_NAME==Linux
+
 cleantmpdir
 
 end

[gentoo-commits] proj/portage-utils:master commit in: tests/qmanifest/

[Fabian Groffen]

commit:     f221763fa8d77019f9ef033002ed04eacfef0493
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat May 25 15:58:26 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat May 25 15:58:26 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=f221763f

tests/qmanifest: skip sanity check

old gpg output is vastly different and cannot be patched up, so skip it

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 tests/qmanifest/dotest          | 3 +--
 tests/qmanifest/manifestp6.good | 5 -----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/tests/qmanifest/dotest b/tests/qmanifest/dotest
index abab463..9587141 100755
--- a/tests/qmanifest/dotest
+++ b/tests/qmanifest/dotest
@@ -69,9 +69,8 @@ gpg_import() {
 		echo "${pass}" | gpg "${args[@]}"
 	fi
 }
-# import key and sanity check
+# import key
 gpg_import "${as}"/key.gpg qmanifest
-test p6 0 "gpg --list-keys | sed '1,2d'"
 
 # make it a fully valid tree
 rm testtree/my-cat/mypackage/unrecorded-file

diff --git a/tests/qmanifest/manifestp6.good b/tests/qmanifest/manifestp6.good
deleted file mode 100644
index ece3fa7..0000000
--- a/tests/qmanifest/manifestp6.good
+++ /dev/null
@@ -1,5 +0,0 @@
-pub   rsa2048 2019-05-24 [SC]
-      3D695C8C0F87966B62DC5AFCDCFABA8E07F52261
-uid           [ unknown] Qmanifest Test Key
-sub   rsa2048 2019-05-24 [E]
-

[gentoo-commits] proj/portage-utils:master commit in: tests/qmanifest/

[Fabian Groffen]

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

tests/qmanifest: try and work with old gpg

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 tests/qmanifest/dotest | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/tests/qmanifest/dotest b/tests/qmanifest/dotest
index 549223b..a6b1431 100755
--- a/tests/qmanifest/dotest
+++ b/tests/qmanifest/dotest
@@ -50,14 +50,28 @@ mkdir "${HOME}"/.gnupg
 # silence gpg warnings
 chmod -R og-rwx "${HOME}"/.gnupg
 
+gpg_import() {
+	local key=$1
+	local pass=$2
+	local args=(
+		--batch
+		--quiet
+		--no-tty
+		--passphrase-fd 0
+		--import "${key}"
+	)
+	local killpinentry="--pinentry-mode loopback"
+
+	# see if gpg is new enough for killpinentry
+	echo "${pass}" | gpg -n ${killpinentry} "${args[@]}"
+	if [[ $? -ne 0 ]] ; then
+		echo "${pass}" | gpg "${args[@]}"
+	else
+		echo "${pass}" | gpg ${killpinentry} "${args[@]}"
+	fi
+}
 # import key and sanity check
-echo qmanifest | gpg \
-	--batch \
-	--quiet \
-	--no-tty \
-	--passphrase-fd 0 \
-	--pinentry-mode loopback \
-	--import "${as}"/key.gpg
+gpg_import "${as}"/key.gpg qmanifest
 test p6 0 "gpg --list-keys | sed '1,2d'"
 
 # make it a fully valid tree

[gentoo-commits] proj/portage-utils:master commit in: tests/qmanifest/

[Fabian Groffen]

commit:     4551aa7c34b13bf71359d288cd2bee39eed61590
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat May 25 14:24:16 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat May 25 14:24:16 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=4551aa7c

tests/qmanifest: attempt to verify gpg setup

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 tests/qmanifest/dotest          | 4 ++++
 tests/qmanifest/manifestp6.good | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/tests/qmanifest/dotest b/tests/qmanifest/dotest
index c248cae..177a913 100755
--- a/tests/qmanifest/dotest
+++ b/tests/qmanifest/dotest
@@ -49,6 +49,10 @@ export HOME=$(mktemp -d)  # for gnupg home
 cp -r "${ROOT}/.gnupg" "${HOME}/"
 # silence gpg warnings
 chmod -R og-rwx "${HOME}"/.gnupg
+
+# sanity check
+test p6 0 "gpg --list-keys | sed '1,2d'"
+
 # make it a fully valid tree
 rm testtree/my-cat/mypackage/unrecorded-file
 # drop ROOT, we'll work here in T

diff --git a/tests/qmanifest/manifestp6.good b/tests/qmanifest/manifestp6.good
new file mode 100644
index 0000000..6a392a3
--- /dev/null
+++ b/tests/qmanifest/manifestp6.good
@@ -0,0 +1,5 @@
+pub   rsa2048 2019-05-24 [SC]
+      3D695C8C0F87966B62DC5AFCDCFABA8E07F52261
+uid           [ultimate] Qmanifest Test Key
+sub   rsa2048 2019-05-24 [E]
+

[gentoo-commits] proj/portage-utils:master commit in: tests/qmanifest/

[Fabian Groffen]

commit:     63b9c1b3a7d0c5420f46a7ff31bf478d3fd3cbc1
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat May 25 13:49:30 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat May 25 13:49:30 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=63b9c1b3

tests/qmanifest: enable GPGME debugging for Travis

 tests/qmanifest/dotest | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/qmanifest/dotest b/tests/qmanifest/dotest
index 4e8c66f..c248cae 100755
--- a/tests/qmanifest/dotest
+++ b/tests/qmanifest/dotest
@@ -16,6 +16,7 @@ test() {
 	sed -i -e '/^checked [0-9]/s/ in [0-9.]\+s$//' manifest
 	if ! diff -u ${as}/manifest${num}.good manifest; then
 		tfail "output does not match"
+		[[ -e gpgme.log ]] && cat gpgme.log
 	fi
 	if [[ ${exp} -ne ${ret} ]] ; then
 		tfail "exit code (${ret}) does not match expected (${exp}) for test ${num}"
@@ -54,9 +55,12 @@ rm testtree/my-cat/mypackage/unrecorded-file
 unset ROOT PORTAGE_CONFIGROOT
 SIGNAS=0x3D695C8C0F87966B62DC5AFCDCFABA8E07F52261
 KEYPASS=qmanifest
+export GPGME_DEBUG=9:${PWD}/gpgme.log
+rm -f gpgme.log
 test 06 0 "echo ${KEYPASS} | qmanifest -g -s ${SIGNAS} -p testtree"
 
 # validate the just generated tree
+rm -f gpgme.log
 test 07 0 "qmanifest testtree | sed -e '/Manifest timestamp/d' -e 's/made .* UTC by/made by/'"
 
 # shut down agents and whatnot

[gentoo-commits] proj/portage-utils:master commit in: tests/qmanifest/

[Fabian Groffen]

commit:     5db00ff1e743cc7383849cea9434a7d5df3b80e0
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat May 25 13:35:37 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat May 25 13:35:37 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=5db00ff1

tests/qmanifest: move GNUPG homedir to TMPDIR

Hopefully, TMPDIR is shorter than our T.  gpgme is pretty annoying when
it comes to paths, it often considers a path to be too long, so we need
to keep it to a minimum.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 tests/qmanifest/dotest | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/qmanifest/dotest b/tests/qmanifest/dotest
index 9d28133..4e8c66f 100755
--- a/tests/qmanifest/dotest
+++ b/tests/qmanifest/dotest
@@ -44,9 +44,10 @@ test 05 1 "qmanifest -o notatree"
 # generate a valid tree
 rm -Rf testtree
 cp -r "${ROOT}/simpletree" testtree || echo try it anyway
-export HOME=${ROOT}  # for gnupg home
+export HOME=$(mktemp -d)  # for gnupg home
+cp -r "${ROOT}/.gnupg" "${HOME}/"
 # silence gpg warnings
-chmod -R og-rwx "${ROOT}"/.gnupg
+chmod -R og-rwx "${HOME}"/.gnupg
 # make it a fully valid tree
 rm testtree/my-cat/mypackage/unrecorded-file
 # drop ROOT, we'll work here in T
@@ -60,6 +61,7 @@ test 07 0 "qmanifest testtree | sed -e '/Manifest timestamp/d' -e 's/made .* UTC
 
 # shut down agents and whatnot
 gpgconf --kill all
+rm -Rf "${HOME}"
 
 cleantmpdir
 

[gentoo-commits] proj/portage-utils:master commit in: tests/qmanifest/

[Fabian Groffen]

commit:     b009f6e6e3218e80e79e7e01d21beb52ec09aa89
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat May 25 13:15:59 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat May 25 13:15:59 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=b009f6e6

tests/qmanifest: silence some gpg warnings about permissions

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 tests/qmanifest/dotest | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/qmanifest/dotest b/tests/qmanifest/dotest
index fb2aa22..9d28133 100755
--- a/tests/qmanifest/dotest
+++ b/tests/qmanifest/dotest
@@ -44,9 +44,12 @@ test 05 1 "qmanifest -o notatree"
 # generate a valid tree
 rm -Rf testtree
 cp -r "${ROOT}/simpletree" testtree || echo try it anyway
-# make it a fully valid tree
 export HOME=${ROOT}  # for gnupg home
+# silence gpg warnings
+chmod -R og-rwx "${ROOT}"/.gnupg
+# make it a fully valid tree
 rm testtree/my-cat/mypackage/unrecorded-file
+# drop ROOT, we'll work here in T
 unset ROOT PORTAGE_CONFIGROOT
 SIGNAS=0x3D695C8C0F87966B62DC5AFCDCFABA8E07F52261
 KEYPASS=qmanifest