[X2Go-Commits] [x2go-keyring] 22/47: t/no-expired.t: adapt to new layout.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2go-keyring.

commit cd6e9853f24533cd6aac1c2bbcb76bd2ca7f475c
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Aug 4 14:15:02 2019 +0200

    t/no-expired.t: adapt to new layout.
---
 debian/changelog | 1 +
 t/no-expired.t   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 436c70a..cf43bcd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,7 @@ x2go-keyring (2014.07.09) UNRELEASED; urgency=medium
   * t/no-expired.t: switch to bash.
   * t/no-expired.t: improve quoting.
   * t/no-expired.t: make exit code variable an integer.
+  * t/no-expired.t: adapt to new layout.
   * debian/control:
     - Change maintainer to the mailing list.
     - Add the old package maintainer to the Uploaders field and myself.
diff --git a/t/no-expired.t b/t/no-expired.t
index 7a20174..d20349f 100755
--- a/t/no-expired.t
+++ b/t/no-expired.t
@@ -5,14 +5,14 @@ set -e
 find_expired () {
 	k="${1}"
 	gpg --no-options --no-auto-check-trustdb --no-default-keyring \
-		--keyring "./output/keyrings/${k}" --list-keys --with-colons \
+		--keyring "keyrings/${k}" --list-keys --with-colons \
 		| grep '^pub' \
 		| awk -F':' --assign keyring="${1}" \
 		'$2 == "e" {print keyring ":\t0x" $5 " expired on " $7}'
 }
 
 typeset -i fail='0'
-for keyring in 'x2go-maintainers.gpg' 'x2go-keyring.gpg'; do
+for keyring in 'x2go-maintainers-keyring.gpg' 'x2go-archive-keyring.gpg'; do
 	find_expired "${keyring}"
 done
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2go-keyring.git