tweaks to tests/basic for new monkeysphere-host ui

[monkeysphere.git] / tests / basic

diff --git a/tests/basic b/tests/basic
index 159f9dcc30337cd8323347a8ca7ae8e68186d6f7..8cf093320a1cdeaa5a8aa1bf328269765f1a7970 100755 (executable)
--- a/tests/basic
+++ b/tests/basic
@@ -133,6 +133,8 @@ export MONKEYSPHERE_SYSCONFIGDIR="$TEMPDIR"
 export MONKEYSPHERE_SYSSHAREDIR="$TESTDIR"/../src/share
 export MONKEYSPHERE_MONKEYSPHERE_USER=$(whoami)
 
+HOST_KEY_FILE="$MONKEYSPHERE_SYSCONFIGDIR"/host_keys.pub.gpg
+
 export MONKEYSPHERE_CHECK_KEYSERVER=false
 # example.org does not respond to the HKP port, so this should cause
 # any keyserver connection attempts that do happen (they shouldn't!)
@@ -159,7 +161,7 @@ export DISPLAY=monkeys
 
 ## we cannot do proper directory permissions checking if the current
 ## working directory has unsatisfactory permissions:
-if ( . "$MONKEYSPHERE_SYSSHAREDIR"/common && check_key_file_permissions $(whoami) "$TEMPDIR" ) ; then 
+if "$MONKEYSPHERE_SYSSHAREDIR"/checkperms $(whoami) "$TEMPDIR"; then 
     echo "Permissions on temporary directory '$TEMPDIR' are OK for permissions checks."
     TEMPDIR_PERMISSIONS_SAFE=yes
 else
@@ -250,7 +252,7 @@ echo
 echo "##################################################"
 echo "### import host key..."
 ssh-keygen -b 1024 -t rsa -N '' -f "$TEMPDIR"/ssh_host_rsa_key
-monkeysphere-host import-key "$TEMPDIR"/ssh_host_rsa_key testhost
+monkeysphere-host import-key "$TEMPDIR"/ssh_host_rsa_key ssh://testhost
 
 echo
 echo "##################################################"
@@ -270,7 +272,7 @@ monkeysphere-host set-expire 1
 echo
 echo "##################################################"
 echo "### certifying server host key..."
-< "$MONKEYSPHERE_SYSCONFIGDIR"/ssh_host_rsa_key.pub.gpg gpgadmin --import
+< "$HOST_KEY_FILE" gpgadmin --import
 echo y | gpgadmin --command-fd 0 --sign-key "$HOSTKEYID"
 
 # FIXME: add revoker?
@@ -500,8 +502,8 @@ target_hostname=testhost2 ssh_test 255
 echo
 echo "##################################################"
 echo "### add hostname, certify by admin, import by user..."
-monkeysphere-host add-hostname testhost2
-< "$MONKEYSPHERE_SYSCONFIGDIR"/ssh_host_rsa_key.pub.gpg gpgadmin --import
+monkeysphere-host add-hostname ssh://testhost2
+<"$HOST_KEY_FILE" gpgadmin --import
 printf "y\ny\n" | gpgadmin --command-fd 0 --sign-key "$HOSTKEYID"
 
 echo
@@ -514,15 +516,15 @@ ssh_test
 echo
 echo "##################################################"
 echo "### ssh connection test directly to 'testhost2' ..."
-gpg --import <"$MONKEYSPHERE_SYSCONFIGDIR"/ssh_host_rsa_key.pub.gpg 
+gpg --import <"$HOST_KEY_FILE"
 gpg --check-trustdb
 target_hostname=testhost2 ssh_test
 
 echo
 echo "##################################################"
 echo "### ssh connection test for failure with 'testhost2' revoked..."
-monkeysphere-host revoke-hostname testhost2
-gpg --import <"$MONKEYSPHERE_SYSCONFIGDIR"/ssh_host_rsa_key.pub.gpg
+monkeysphere-host revoke-hostname ssh://testhost2
+gpg --import <"$HOST_KEY_FILE"
 gpg --check-trustdb
 target_hostname=testhost2 ssh_test 255