test: Use :$(id -gn) instead of :root (when run as root)

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

diff --git a/test/integration/test-apt-key-net-update b/test/integration/test-apt-key-net-update
index 9702e0ca858f209c365aa608086b32046ed7a4a9..b9f716e10e4f20ef060eb2f6141756842c0b9722 100755 (executable)
--- a/test/integration/test-apt-key-net-update
+++ b/test/integration/test-apt-key-net-update
@@ -16,24 +16,19 @@ 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
 
 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:${APTHTTPPORT}/ubuntu/project/test-archive-keyring.pub\";" >> ./aptconfig.conf
 echo 'APT::Key::Net-Update-Enabled "1";' >> ./aptconfig.conf
 
 # test against the "real" webserver
 mkdir -p aptarchive/ubuntu/project
 install -m0644 keys/test-archive-keyring.pub aptarchive/ubuntu/project/
 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

-testsuccessequal 'Checking for new archive signing keys now
-gpg: key F68C85A3: public key "Test Automatic Archive Signing Key <ftpmaster@example.com>" 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
 
 # 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:${APTHTTPPORT}/ubuntu/project/marvinparanoid.pub\";" >> ./aptconfig.conf
 mkdir -p aptarchive/ubuntu/project
 install -m0644 keys/marvinparanoid.pub aptarchive/ubuntu/project/
 echo "APT::Key::ArchiveKeyringURI \"http://localhost:${APTHTTPPORT}/ubuntu/project/marvinparanoid.pub\";" >> ./aptconfig.conf


@@ -43,6 +38,4 @@ echo 'APT::Key::Net-Update-Enabled "1";' >> ./aptconfig.conf
 testsuccessequal "Checking for new archive signing keys now
 Key 'DE66AECA9151AFA1877EC31DE8525D47528144E2' not added. It is not signed with a master key" aptkey --fakeroot net-update
 
 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'