diff options
| author | Julian Andres Klode <jak@debian.org> | 2024-11-24 14:20:00 +0100 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2024-11-24 14:21:24 +0100 |
| commit | d4f64227803185a1eeaf92392820b684d7a11753 (patch) | |
| tree | e8ed47692dc150206797fe879980e26d2692cc91 /test | |
| parent | 731c8bf96c06abce3797859e5d784e2caaf137c3 (diff) | |
test-apt-cdrom: Hande assert-pubkey-algo like other gpgv messages
Not all gpgv implementations support that flag and we no longer
default to gpgv; so we may not have support for it, so let's just
handle it like other gpgv messages.
Diffstat (limited to 'test')
| -rwxr-xr-x | test/integration/test-apt-cdrom | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/test/integration/test-apt-cdrom b/test/integration/test-apt-cdrom index e8ccb10a4..b3234765c 100755 --- a/test/integration/test-apt-cdrom +++ b/test/integration/test-apt-cdrom @@ -32,6 +32,7 @@ aptcdromlog() { sed -e '/gpgv\?:\s*Signature made/ d' \ -e '/gpgv\?:\s*Good signature/ d' \ -e '/gpgv\?:\s*using RSA key/ d' \ + -e '/gpgv\?:\s*asserted signer/d' \ -e '/gpgv\?:\s*issuer/ d' \ -e '/^Identifying/ d' \ -e '/Reading / d' rootdir/tmp/apt-cdrom.log @@ -41,23 +42,6 @@ aptcdromlog() { aptautotest_aptcdromlog_add() { aptautotest_aptget_update "$@"; } -msgtest "Checking --assert-pubkey-algo support" -gpgv_msg="" -test="$(LC_ALL=C.UTF-8 gpgv --assert-pubkey-algo 2>&1 || :)" -case "$test" in - *"missing argument"*) - gpgv_msg=" -gpgv: asserted signer '34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE' with algo rsa2048" - msgpass - ;; - *[Ii]"nvalid option"*"assert-pubkey-algo"*) - msgskip - ;; - *) - msgfail "Unknown response from gpgv to --assert-pubkey-algo check: $test" - ;; -esac - CDROM_PRE="Using CD-ROM mount point $(readlink -f ./rootdir/media)/cdrom/ Unmounting CD-ROM... Waiting for disc... @@ -65,7 +49,7 @@ Please insert a Disc in the drive and press [Enter] Mounting CD-ROM... Scanning disc for index files..." CDROM_POST="This disc is called: -'Debian APT Testdisk 0.8.15'$gpgv_msg +'Debian APT Testdisk 0.8.15' Writing new source list Source list entries for this disc are: deb cdrom:[Debian APT Testdisk 0.8.15]/ stable main |