do not ignore differently versioned self-provides

[apt.git] / test / integration / test-apt-key

diff --git a/test/integration/test-apt-key b/test/integration/test-apt-key
index 4dbf3d66dfe25ff4deac8f3837b7a379a0d5771b..a1a0d883db6af1c71f6d77521fc3532a08c2bb71 100755 (executable)
--- a/test/integration/test-apt-key
+++ b/test/integration/test-apt-key
@@ -188,7 +188,7 @@ gpg:              unchanged: 1' aptkey --fakeroot update
                adv --batch --yes --default-key 'Marvin' --armor --detach-sign --sign --output signature.gpg signature
 
 
                adv --batch --yes --default-key 'Marvin' --armor --detach-sign --sign --output signature.gpg signature
 
 

-       for GPGV in 'gpgv' 'gpgv2' '/does/not/exist'; do
+       for GPGV in '' 'gpgv' 'gpgv2'; do

                echo "APT::Key::GPGVCommand \"$GPGV\";" > rootdir/etc/apt/apt.conf.d/00gpgvcmd
 
                msgtest 'Test verify a file' 'with all keys'
                echo "APT::Key::GPGVCommand \"$GPGV\";" > rootdir/etc/apt/apt.conf.d/00gpgvcmd
 
                msgtest 'Test verify a file' 'with all keys'


@@ -204,6 +204,7 @@ gpg:              unchanged: 1' aptkey --fakeroot update
                testfailure --nomsg aptkey --quiet --readonly --keyring keys/does-not-exist.pub verify signature.gpg signature
                testfailure test -e keys/does-not-exist.pub
 
                testfailure --nomsg aptkey --quiet --readonly --keyring keys/does-not-exist.pub verify signature.gpg signature
                testfailure test -e keys/does-not-exist.pub
 

+               # note: this isn't how apts gpgv method implements keyid for verify

                msgtest 'Test verify a file' 'with good keyid'
                testsuccess --nomsg aptkey --quiet --readonly --keyid 'Paranoid' verify signature.gpg signature
 
                msgtest 'Test verify a file' 'with good keyid'
                testsuccess --nomsg aptkey --quiet --readonly --keyid 'Paranoid' verify signature.gpg signature