X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=tests%2Fbasic;h=0ae398b6acc2feeff33fceb4f748bca400422384;hb=5530ebf34aeff13473b70f0704f037ed127a3c0d;hp=de8a6591bd88ba1c15507a774e1ec1dabea6deb0;hpb=d31c6e8ae587c69731b3cead53358a5b6ddb88ea;p=monkeysphere.git

diff --git a/tests/basic b/tests/basic
index de8a659..0ae398b 100755
--- a/tests/basic
+++ b/tests/basic
@@ -250,7 +250,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 "##################################################"
@@ -505,8 +505,8 @@ echo "### ssh connection test directly to 'testhost2' without new name..."
 target_hostname=testhost2 ssh_test 255
 echo
 echo "##################################################"
-echo "### add hostname, certify by admin, import by user..."
-monkeysphere-host add-hostname testhost2
+echo "### add servicename, certify by admin, import by user..."
+monkeysphere-host add-servicename ssh://testhost2
 < "$MONKEYSPHERE_SYSCONFIGDIR"/ssh_host_rsa_key.pub.gpg gpgadmin --import
 printf "y\ny\n" | gpgadmin --command-fd 0 --sign-key "$HOSTKEYID"
 
@@ -527,7 +527,7 @@ target_hostname=testhost2 ssh_test
 echo
 echo "##################################################"
 echo "### ssh connection test for failure with 'testhost2' revoked..."
-monkeysphere-host revoke-hostname testhost2
+monkeysphere-host revoke-servicename ssh://testhost2
 gpg --import <"$MONKEYSPHERE_SYSCONFIGDIR"/ssh_host_rsa_key.pub.gpg
 gpg --check-trustdb
 target_hostname=testhost2 ssh_test 255
@@ -535,9 +535,7 @@ target_hostname=testhost2 ssh_test 255
 # FIXME: addtest: remove admin as id-certifier and check ssh failure
 
 # FIXME: addtest: how do we test that set-expire makes sense after new
-# hostnames have been added?
-
-# FIXME: addtest: revoke the host key and check ssh failure
+# servicenames have been added?
 
 # test to make sure things are OK after the previous tests:
 echo
@@ -551,7 +549,7 @@ ssh_test
 
 echo
 echo "##################################################"
-echo "### revoking host key..."
+echo "### revoking ssh host key..."
 # generate the revocation certificate and feed it directly to the test
 # user's keyring (we're not publishing to the keyservers)
 monkeysphere-host revoke-key | gpg --import