Skip to content

Commit

Permalink
Merge pull request #499 from amatsuda/typos
Browse files Browse the repository at this point in the history
Typos
  • Loading branch information
mfazekas committed Feb 10, 2017
2 parents ef72411 + 41bb6a6 commit c471af1
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions lib/net/ssh/connection/channel.rb
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@ def do_failure
if callback = pending_requests.shift
callback.call(self, false)
else
error { "channel failure recieved with no pending request to handle it (bug?)" }
error { "channel failure received with no pending request to handle it (bug?)" }
end
end

Expand All @@ -623,7 +623,7 @@ def do_success
if callback = pending_requests.shift
callback.call(self, true)
else
error { "channel success recieved with no pending request to handle it (bug?)" }
error { "channel success received with no pending request to handle it (bug?)" }
end
end

Expand Down
4 changes: 2 additions & 2 deletions lib/net/ssh/transport/algorithms.rb
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def initialize(session, options={})

# Start the algorithm negotation
def start
raise ArgumentError, "Cannot call start if it's negoitation started or done" if @pending || @initialized
raise ArgumentError, "Cannot call start if it's negotiation started or done" if @pending || @initialized
send_kexinit
end

Expand All @@ -135,7 +135,7 @@ def rekey!
send_kexinit
end

# Called by the transport layer when a KEXINIT packet is recieved, indicating
# Called by the transport layer when a KEXINIT packet is received, indicating
# that the server wants to exchange keys. This can be spontaneous, or it
# can be in response to a client-initiated rekey request (see #rekey!). Either
# way, this will block until the key exchange completes.
Expand Down
2 changes: 1 addition & 1 deletion lib/net/ssh/transport/session.rb
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ def poll_message(mode=:nonblock, consume_queue=true)
raise Net::SSH::Disconnect, "disconnected: #{packet[:description]} (#{packet[:reason_code]})"

when IGNORE
debug { "IGNORE packet recieved: #{packet[:data].inspect}" }
debug { "IGNORE packet received: #{packet[:data].inspect}" }

when UNIMPLEMENTED
lwarn { "UNIMPLEMENTED: #{packet[:number]}" }
Expand Down
8 changes: 4 additions & 4 deletions test/authentication/test_agent.rb
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def test_connect_should_raise_error_if_connection_could_not_be_established
assert_raises(Net::SSH::Authentication::AgentNotAvailable) { agent(false).connect! }
end

def test_negotiate_should_raise_error_if_ssh2_agent_response_recieved
def test_negotiate_should_raise_error_if_ssh2_agent_response_received
socket.expect do |s, type, buffer|
assert_equal SSH2_AGENT_REQUEST_VERSION, type
assert_equal Net::SSH::Transport::ServerVersion::PROTO_VERSION, buffer.read_string
Expand All @@ -88,23 +88,23 @@ def test_negotiate_should_be_successful_with_expected_response
assert_nothing_raised { agent(:connect).negotiate! }
end

def test_identities_should_fail_if_SSH_AGENT_FAILURE_recieved
def test_identities_should_fail_if_SSH_AGENT_FAILURE_received
socket.expect do |s, type, buffer|
assert_equal SSH2_AGENT_REQUEST_IDENTITIES, type
s.return(SSH_AGENT_FAILURE)
end
assert_raises(Net::SSH::Authentication::AgentError) { agent.identities }
end

def test_identities_should_fail_if_SSH2_AGENT_FAILURE_recieved
def test_identities_should_fail_if_SSH2_AGENT_FAILURE_received
socket.expect do |s, type, buffer|
assert_equal SSH2_AGENT_REQUEST_IDENTITIES, type
s.return(SSH2_AGENT_FAILURE)
end
assert_raises(Net::SSH::Authentication::AgentError) { agent.identities }
end

def test_identities_should_fail_if_SSH_COM_AGENT2_FAILURE_recieved
def test_identities_should_fail_if_SSH_COM_AGENT2_FAILURE_received
socket.expect do |s, type, buffer|
assert_equal SSH2_AGENT_REQUEST_IDENTITIES, type
s.return(SSH_COM_AGENT2_FAILURE)
Expand Down
2 changes: 1 addition & 1 deletion test/connection/test_channel.rb
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ def expect(&block)
end

def send_message(msg)
raise "#{msg.to_s.inspect} recieved but no message was expected" unless @expectation
raise "#{msg.to_s.inspect} received but no message was expected" unless @expectation
packet = Net::SSH::Packet.new(msg.to_s)
callback, @expectation = @expectation, nil
callback.call(self, packet)
Expand Down
2 changes: 1 addition & 1 deletion test/transport/test_algorithms.rb
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ def kexinit(options={})
:string, options[:compression_client] || "none,zlib@openssh.com,zlib",
:string, options[:compression_server] || "none,zlib@openssh.com,zlib",
:string, options[:language_client] || "",
:string, options[:langauge_server] || "",
:string, options[:language_server] || "",
:bool, options[:first_kex_follows])
end

Expand Down

0 comments on commit c471af1

Please sign in to comment.