diff options
| author | Matt Goins <mjgoins@openflows.com> | 2009-01-31 18:32:12 -0500 |
|---|---|---|
| committer | Matt Goins <mjgoins@openflows.com> | 2009-01-31 18:32:12 -0500 |
| commit | 26bdfd9c0aa0853ca1ea80e1980e7e9849646e10 (patch) | |
| tree | 1a92ec7a3cc4df963bf8d3df82115c39ea4fe031 /tests/basic | |
| parent | 53f4ee78f320371a0f07865b21fdb4d6707a79d6 (diff) | |
| parent | 7d4b4815db8ba2f6f984a18a90b50032cf9158ba (diff) | |
Merge commit 'dkg/master'
Conflicts:
src/monkeysphere-host
Diffstat (limited to 'tests/basic')
| -rwxr-xr-x | tests/basic | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/basic b/tests/basic index 5ba7a25..7fdca39 100755 --- a/tests/basic +++ b/tests/basic @@ -8,8 +8,7 @@ # Copyright: 2008 # License: GPL v3 or later -# these tests should all be able to -# as a non-privileged user. +# these tests should all be able to run as a non-privileged user. # all subcommands in this script should complete without failure: set -e @@ -193,7 +192,7 @@ echo | monkeysphere-server gen-key --length 1024 --expire 0 testhost # remove the gpg.conf rm "$MONKEYSPHERE_SYSCONFIGDIR"/gnupg-host/gpg.conf -HOSTKEYID=$( monkeysphere-server show-key | tail -n1 | cut -f3 -d\ ) +HOSTKEYID=$( monkeysphere-server show-key | grep '^OpenPGP fingerprint: ' | cut -f3 -d\ ) # certify it with the "Admin's Key". # (this would normally be done via keyservers) |