From: Daniel Kahn Gillmor Date: Fri, 15 Jan 2010 02:20:35 +0000 (-0500) Subject: updated test suite to use scheme://hostname instead of raw hostname, in preparation... X-Git-Tag: monkeysphere_0.28~41^2~9 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=f5b9a51e0d2fbdaaa0b5987f1cb3ea0b6a8da7c2;hp=d31c6e8ae587c69731b3cead53358a5b6ddb88ea;p=monkeysphere.git updated test suite to use scheme://hostname instead of raw hostname, in preparation for multi-key monkeysphere-host --- diff --git a/tests/basic b/tests/basic index de8a659..ae30529 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 "##################################################" @@ -506,7 +506,7 @@ target_hostname=testhost2 ssh_test 255 echo echo "##################################################" echo "### add hostname, certify by admin, import by user..." -monkeysphere-host add-hostname testhost2 +monkeysphere-host add-hostname 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-hostname ssh://testhost2 gpg --import <"$MONKEYSPHERE_SYSCONFIGDIR"/ssh_host_rsa_key.pub.gpg gpg --check-trustdb target_hostname=testhost2 ssh_test 255