added simple basic test for second key for monkeysphere-host, pulled this time from...

diff --git a/packaging/debian/control b/packaging/debian/control
index 3d41f00bd53ceb60d3db999a25638b100bb9647a..d70d02340d7eb269e838ec5968399f8bcb5d8328 100644 (file)
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -3,7 +3,7 @@ Section: net
 Priority: extra
 Maintainer: Jameson Rollins <jrollins@finestructure.net>
 Uploaders:  Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Build-Depends: debhelper (>= 7.0), cpio, socat, openssh-server, gnupg, libcrypt-openssl-rsa-perl, libdigest-sha-perl, lockfile-progs | procmail
+Build-Depends: debhelper (>= 7.0), cpio, socat, openssh-server, gnupg, libcrypt-openssl-rsa-perl, libdigest-sha-perl, lockfile-progs | procmail, openssl
 Standards-Version: 3.8.3
 Homepage: http://web.monkeysphere.info/
 Vcs-Git: git://git.monkeysphere.info/monkeysphere

diff --git a/tests/basic b/tests/basic
index ceb996319cb1b77770fb620b7c157f5ab32acc74..f808387ec9ccb65b93cf9bbe14b6829c131cfa42 100755 (executable)
--- a/tests/basic
+++ b/tests/basic
@@ -547,6 +547,19 @@ echo "##################################################"
 echo "### ssh connection test for success..."
 ssh_test
 
+echo
+echo "##################################################"
+echo "### Testing TLS setup..."
+
+openssl req -config "$TESTDIR"/openssl.cnf -x509 -newkey rsa:1024 -subj '/DC=net/DC=example/DC=testhost/CN=testhost.example.net/' -days 3 -keyout "$TEMPDIR"/tls_key.pem -nodes >"$TEMPDIR"/tls_cert.pem
+monkeysphere-host import-key "$TEMPDIR"/tls_key.pem https://testhost
+
+# FIXME: how can we test this via an https client?  
+# We don't currently provide one.
+
+# FIXME: should we test other monkeysphere-host operations somehow now
+# that we have more than one key in the host keyring?
+
 echo
 echo "##################################################"
 echo "### revoking ssh host key..."