X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/a4221092e50af0b74040f5b4ee800c78b05fd84e..952171787a0b865c17d5c9476e272106383ae93a:/test/integration/test-apt-key-net-update?ds=sidebyside diff --git a/test/integration/test-apt-key-net-update b/test/integration/test-apt-key-net-update index b3c118555..b9f716e10 100755 --- a/test/integration/test-apt-key-net-update +++ b/test/integration/test-apt-key-net-update @@ -1,8 +1,8 @@ #!/bin/sh set -e -TESTDIR=$(readlink -f $(dirname $0)) -. $TESTDIR/framework +TESTDIR="$(readlink -f "$(dirname "$0")")" +. "$TESTDIR/framework" setupenvironment configarchitecture "i386" @@ -16,33 +16,26 @@ mkdir -p usr/share/keyrings install -m0644 keys/test-master-keyring.pub usr/share/keyrings echo "APT::Key::MasterKeyring \"${TMPWORKINGDIRECTORY}/usr/share/keyrings/test-master-keyring.pub\";" >> ./aptconfig.conf -# setup archive-keyring +# setup archive-keyring mkdir -p aptarchive/ubuntu/project install -m0644 keys/test-archive-keyring.pub aptarchive/ubuntu/project/ -echo 'APT::Key::ArchiveKeyringURI "http://localhost:8080/ubuntu/project/test-archive-keyring.pub";' >> ./aptconfig.conf +echo "APT::Key::ArchiveKeyringURI \"http://localhost:${APTHTTPPORT}/ubuntu/project/test-archive-keyring.pub\";" >> ./aptconfig.conf echo 'APT::Key::Net-Update-Enabled "1";' >> ./aptconfig.conf # test against the "real" webserver -testequal 'Checking for new archive signing keys now -gpg: key F68C85A3: public key "Test Automatic Archive Signing Key " imported -gpg: Total number processed: 1 -gpg: imported: 1 (RSA: 1)' aptkey --fakeroot net-update - -aptkey list | grep '^pub' > aptkey.list -testfileequal ./aptkey.list 'pub 1024R/F68C85A3 2013-12-19 -pub 2048R/DBAC8DAE 2010-08-18' +testsuccess aptkey --fakeroot net-update +testfailure grep 'not added' rootdir/tmp/testsuccess.output +testaptkeys 'oldarchive' 'newarchive' # now try a different one -# setup archive-keyring +# setup archive-keyring mkdir -p aptarchive/ubuntu/project install -m0644 keys/marvinparanoid.pub aptarchive/ubuntu/project/ -echo 'APT::Key::ArchiveKeyringURI "http://localhost:8080/ubuntu/project/marvinparanoid.pub";' >> ./aptconfig.conf +echo "APT::Key::ArchiveKeyringURI \"http://localhost:${APTHTTPPORT}/ubuntu/project/marvinparanoid.pub\";" >> ./aptconfig.conf echo 'APT::Key::Net-Update-Enabled "1";' >> ./aptconfig.conf # test against the "real" webserver -testequal "Checking for new archive signing keys now +testsuccessequal "Checking for new archive signing keys now Key 'DE66AECA9151AFA1877EC31DE8525D47528144E2' not added. It is not signed with a master key" aptkey --fakeroot net-update -aptkey list | grep '^pub' > aptkey.list -testfileequal ./aptkey.list 'pub 1024R/F68C85A3 2013-12-19 -pub 2048R/DBAC8DAE 2010-08-18' +testaptkeys 'oldarchive' 'newarchive'