diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-10-04 23:03:08 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-10-04 23:03:08 +0200 |
| commit | d787fe83b74f68dd033e74ce9aeb0120806a17be (patch) | |
| tree | 065ce6adde6eac8f5ec0367a5dbcc7db6ab07492 /test | |
| parent | f20750cb30baaf00ca1b87f2ae55e6a0eb900f2b (diff) | |
test/integration/test-apt-key-net-update: improve test to test for empty keyring/correct keys
Diffstat (limited to 'test')
| -rwxr-xr-x | test/integration/test-apt-key-net-update | 18 |
1 files changed, 18 insertions, 0 deletions
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 |