@@ -89,8 +89,6 @@ module Net end key_files.each do |file| - # Faking the public key - # public_key_file = file# + '.pub' if File.readable?(file) begin private_key = KeyFactory.load_private_key(file) lib/net/ssh/authentication/key_manager.rb @@ -38,7 +38,7 @@ module Authentication assert_equal 2, identities.length 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]) end @@ -77,6 +77,7 @@ module Authentication File.expects(:readable?).returns(true) # Net::SSH::KeyFactory.expects(:load_public_key).with("#{name}").returns(key) Net::SSH::KeyFactory.expects(:load_private_key).with(name, nil).returns(key).at_least_once + key.expects(:public_key).returns(key) end def rsa(size=32) test/authentication/test_key_manager.rb @@ -7,7 +7,6 @@ require 'net/ssh/loggable' require 'net/ssh/packet' require 'net/ssh/transport/session' require 'ostruct' -require 'rubygems' # clear the default files out so that tests don't get confused by existing # SSH config files. test/common.rb 1e2834380e383fdada2ddf2c907c9b449b463181 Ari Lerner ari.lerner@citrusbyte.com http://github.com/auser/net-ssh/commit/ad693adc688d9c6075c10af48362f330c46d94c8 ad693adc688d9c6075c10af48362f330c46d94c8 2008-12-18T23:40:40-08:00 2008-12-18T23:40:40-08:00 Removed commented lines from old code, fixed two failing specs, ALL SPECS PASS NOW 762438423cc51d1d3a4c745135e918be1f891f97 Ari Lerner ari.lerner@citrusbyte.com