projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
resyn implementation of m-s gen-key with the help output
[monkeysphere.git]
/
tests
/
basic
diff --git
a/tests/basic
b/tests/basic
index c38a74b96c67c72684ca05aaa5ab59fd2b17f321..7fdca39e308037506e073b4603a6ecede1da751f 100755
(executable)
--- a/
tests/basic
+++ b/
tests/basic
@@
-8,8
+8,7
@@
# Copyright: 2008
# License: GPL v3 or later
# 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
# all subcommands in this script should complete without failure:
set -e
@@
-54,6
+53,7
@@
ssh_test() {
# kill the sshd process if it's still running
kill "$SSHD_PID"
# kill the sshd process if it's still running
kill "$SSHD_PID"
+ SSHD_PID=
set -e
set -e
@@
-87,9
+87,16
@@
cleanup() {
echo "### removing temp dir..."
rm -rf "$TEMPDIR"
echo "### removing temp dir..."
rm -rf "$TEMPDIR"
+ if [ "$SSHD_PID" ] ; then
+ echo "### killing off lingering sshd..."
+ kill "$SSHD_PID"
+ fi
+
wait
}
wait
}
+SSHD_PID=
+
## setup trap
trap failed_cleanup EXIT
## setup trap
trap failed_cleanup EXIT
@@
-185,7
+192,7
@@
echo | monkeysphere-server gen-key --length 1024 --expire 0 testhost
# remove the gpg.conf
rm "$MONKEYSPHERE_SYSCONFIGDIR"/gnupg-host/gpg.conf
# 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)
# certify it with the "Admin's Key".
# (this would normally be done via keyservers)