[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