Disable keychain tests if no keychain available

Author: hugoduncan

src/clj_ssh/keychain.clj

@@ -6,9 +6,11 @@
    [clojure.java.shell :as shell]))
 
 (defn ask-passphrase [path]
-  (when-let [console (. System console)]
-    (print "Passphrase for" path ": ")
-    (.readPassword console)))
+  (if-let [console (. System console)]
+    (do (print "Passphrase for" path ": ")
+        (.readPassword console))
+    (throw (ex-info "No means to ask for passphrase"
+                    {:type :clj-ssh/no-passphrase-available}))))
 
 (defmulti keychain-passphrase "Obtain password for path"
   (fn [system path] system))

test/clj_ssh/cli_test.clj

@@ -74,20 +74,23 @@
         (is (connected? session)))
       (is (not (connected? session)))))
   (with-ssh-agent (ssh-agent {:use-system-ssh-agent false})
-    (add-identity-with-keychain
-      :private-key-path (encrypted-private-key-path)
-      :passphrase "clj-ssh")
-    (let [session (session "localhost")]
-      (is (instance? com.jcraft.jsch.Session session))
-      (is (not (connected? session)))
-      (connect session)
-      (is (connected? session))
-      (disconnect session)
-      (is (not (connected? session))))
-    (let [session (session "localhost")]
-      (with-connection session
-        (is (connected? session)))
-      (is (not (connected? session)))))
+    (try (add-identity-with-keychain
+          :private-key-path (encrypted-private-key-path)
+          :passphrase "clj-ssh")
+         (let [session (session "localhost")]
+           (is (instance? com.jcraft.jsch.Session session))
+           (is (not (connected? session)))
+           (connect session)
+           (is (connected? session))
+           (disconnect session)
+           (is (not (connected? session))))
+         (let [session (session "localhost")]
+           (with-connection session
+             (is (connected? session)))
+           (is (not (connected? session))))
+         (catch Exception e
+           (when-not (= :clj-ssh/no-passphrase-available (:type (ex-data e)))
+             (throw e)))))
   (with-ssh-agent (ssh-agent {})
     (let [session (session "localhost")]
       (is (instance? com.jcraft.jsch.Session session))

test/clj_ssh/ssh_test.clj

@@ -138,30 +138,33 @@
           (is (connected? session)))
         (is (not (connected? session)))))
     (testing "key with passphrase"
-      (let [agent (ssh-agent {:use-system-ssh-agent false})]
-        (add-identity-with-keychain
-          agent
-          {:private-key-path (encrypted-private-key-path)
-           :passphrase "clj-ssh"})
-        (let [session (session
-                       agent
-                       "localhost"
-                       {:username (username)
-                        :strict-host-key-checking :no})]
-          (is (instance? com.jcraft.jsch.Session session))
-          (is (not (connected? session)))
-          (connect session)
-          (is (connected? session))
-          (disconnect session)
-          (is (not (connected? session))))
-        (let [session (session
-                       agent
-                       "localhost"
-                       {:username (username)
-                        :strict-host-key-checking :no})]
-          (with-connection session
-            (is (connected? session)))
-          (is (not (connected? session)))))))
+      (try (let [agent (ssh-agent {:use-system-ssh-agent false})]
+             (add-identity-with-keychain
+              agent
+              {:private-key-path (encrypted-private-key-path)
+               :passphrase "clj-ssh"})
+             (let [session (session
+                            agent
+                            "localhost"
+                            {:username (username)
+                             :strict-host-key-checking :no})]
+               (is (instance? com.jcraft.jsch.Session session))
+               (is (not (connected? session)))
+               (connect session)
+               (is (connected? session))
+               (disconnect session)
+               (is (not (connected? session))))
+             (let [session (session
+                            agent
+                            "localhost"
+                            {:username (username)
+                             :strict-host-key-checking :no})]
+               (with-connection session
+                 (is (connected? session)))
+               (is (not (connected? session)))))
+           (catch Exception e
+           (when-not (= :clj-ssh/no-passphrase-available (:type (ex-data e)))
+             (throw e))))))
   (testing "system ssh-agent"
     (let [agent (ssh-agent {})]
       (let [session (session