Use foo.pub key by default, but fall back to private key.

Also, make sure we register the private key itself when we
load it, so that it doesn't get loaded twice (which causes
double passphrase prompts).

1 files changed, 4 insertions, 3 deletions

diff --git a/test/authentication/test_key_manager.rb b/test/authentication/test_key_manager.rb
index ca6b683..af8422b 100644
--- a/test/authentication/test_key_manager.rb
+++ b/test/authentication/test_key_manager.rb
@@ -41,8 +41,8 @@ module Authentication
       assert_equal rsa.to_blob, identities.first.to_blob
       assert_equal dsa.to_blob, identities.last.to_blob
       
-      assert_equal({:from => :file, :file => "/first"}, manager.known_identities[rsa])
-      assert_equal({:from => :file, :file => "/second"}, manager.known_identities[dsa])
+      assert_equal({:from => :file, :file => "/first", :key => rsa}, manager.known_identities[rsa])
+      assert_equal({:from => :file, :file => "/second", :key => dsa}, manager.known_identities[dsa])
     end
 
     def test_identities_should_load_from_agent
@@ -78,7 +78,8 @@ module Authentication
 
       def stub_file_key(name, key, also_private=false)
         manager.add(name)
-        File.expects(:readable?).returns(true)
+        File.expects(:readable?).with(name).returns(true)
+        File.expects(:readable?).with(name + ".pub").returns(false)
         Net::SSH::KeyFactory.expects(:load_private_key).with(name, nil).returns(key).at_least_once
         key.expects(:public_key).returns(key)
       end