projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
testing: A bit more fine-tuning, so that the test suite should successfully complete...
[monkeysphere.git]
/
tests
/
basic
diff --git
a/tests/basic
b/tests/basic
index 8d2b8f8768e2c25545626a368afc977a7d757446..2befac2ed5e6b43807588bac144ac76accaa287d 100755
(executable)
--- a/
tests/basic
+++ b/
tests/basic
@@
-22,18
+22,16
@@
gpgadmin() {
failed_cleanup() {
# FIXME: can we be more verbose here?
echo 'FAILED!'
failed_cleanup() {
# FIXME: can we be more verbose here?
echo 'FAILED!'
+ read -p "press enter to cleanup and remove tmp:"
+
cleanup
}
# cleanup:
cleanup() {
cleanup
}
# cleanup:
cleanup() {
-
- echo
- read -p "press enter to cleanup and remove tmp:"
-
- if ( ps $SSHD_PID >/dev/null ) ; then
+ if ( ps "$SSHD_PID" >/dev/null ) ; then
echo "### stopping still-running sshd..."
echo "### stopping still-running sshd..."
- kill
$SSHD_PID
+ kill
"$SSHD_PID"
fi
echo "### removing temp dir..."
fi
echo "### removing temp dir..."
@@
-162,7
+160,12
@@
monkeysphere-server update-users "$USER"
echo "### testuser connecting to sshd socket..."
ssh-agent bash -c \
echo "### testuser connecting to sshd socket..."
ssh-agent bash -c \
- "monkeysphere subkey-to-ssh-agent && ssh -F $TEMPDIR/testuser/.ssh/config testhost"
+ "monkeysphere subkey-to-ssh-agent && ssh -F $TEMPDIR/testuser/.ssh/config testhost
true
"
trap - EXIT
trap - EXIT
+
+echo
+echo "Monkeysphere basic tests completed successfully!"
+echo
+
cleanup
cleanup