From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 4 Oct 2011 21:03:08 +0000 (+0200)
Subject: test/integration/test-apt-key-net-update: improve test to test for empty keyring... 
X-Git-Tag: 0.9.13.exp1ubuntu1~125^2~3
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/d787fe83b74f68dd033e74ce9aeb0120806a17be?ds=sidebyside

test/integration/test-apt-key-net-update: improve test to test for empty keyring/correct keys
---

diff --git a/test/integration/test-apt-key-net-update b/test/integration/test-apt-key-net-update
index 710c02f61..bc4e6029f 100755
--- a/test/integration/test-apt-key-net-update
+++ b/test/integration/test-apt-key-net-update
@@ -40,6 +40,15 @@ else
     msgpass
 fi
 
+# ensure the keyring is still empty
+gpg_out=$($GPG --list-keys)
+msgtest "Test if keyring is empty"
+if [ -n "" ]; then
+    msgfail
+else
+    msgpass
+fi
+
 # test good keyring and ensure we get no errors
 ADD_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg
 if add_keys_with_verify_against_master_keyring $ADD_KEYRING $MASTER_KEYRING; then
@@ -48,3 +57,12 @@ else
     msgfail
 fi
 
+testequal './etc/apt/trusted.gpg
+---------------------
+pub   1024D/437D05B5 2004-09-12
+uid                  Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>
+sub   2048g/79164387 2004-09-12
+
+pub   1024D/FBB75451 2004-12-30
+uid                  Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>
+' $GPG --list-keys