summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2016-02-04 18:13:05 +0100
committerJulian Andres Klode <jak@debian.org>2016-02-04 18:13:05 +0100
commiteb5113c486955d9cd66126aa59d3a27e52c52e58 (patch)
treeaf609eefcd965b0e0a5691290db5f5c34a569ed0 /test
parent1996a6a785a54efaeddb4ecf5e88fa6070330182 (diff)
test: Fix apt-key tests to work with current gpg 2.1
Diffstat (limited to 'test')
-rw-r--r--test/integration/framework12
1 files changed, 11 insertions, 1 deletions
diff --git a/test/integration/framework b/test/integration/framework
index 2aed77d5b..a1523467d 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -1773,8 +1773,18 @@ createlistofkeys() {
local OUTPUT="$1"
shift
while [ -n "$1" ]; do
+ # gpg 2.1.something starts printing [SC] at some point
+ if grep -q ' rsa2048/' "$OUTPUT" && grep -qF '[SC]' "$OUTPUT"; then
+ case "$1" in
+ *Joe*|*Sixpack*) echo 'pub rsa2048/DBAC8DAE 2010-08-18 [SC]';;
+ *Rex*|*Expired*) echo 'pub rsa2048/27CE74F9 2013-07-12 [SC] [expired: 2013-07-13]';;
+ *Marvin*|*Paranoid*) echo 'pub rsa2048/528144E2 2011-01-16 [SC]';;
+ oldarchive) echo 'pub rsa1024/F68C85A3 2013-12-19 [SC]';;
+ newarchive) echo 'pub rsa2048/DBAC8DAE 2010-08-18 [SC]';;
+ *) echo 'UNKNOWN KEY';;
+ esac
# gpg 2.1 has a slightly different output format
- if grep -q ' rsa2048/' "$OUTPUT"; then
+ elif grep -q ' rsa2048/' "$OUTPUT"; then
case "$1" in
*Joe*|*Sixpack*) echo 'pub rsa2048/DBAC8DAE 2010-08-18';;
*Rex*|*Expired*) echo 'pub rsa2048/27CE74F9 2013-07-12 [expired: 2013-07-13]';;