3 files changed, 23 insertions, 2 deletions
diff --git a/test/channel_test.rb b/test/channel_test.rb
index 2c08573..475c59b 100644
--- a/test/channel_test.rb
+++ b/test/channel_test.rb
@@ -3,7 +3,7 @@ require 'net/ssh/multi/channel'
 
 class ChannelTest < Minitest::Test
   def test_each_should_iterate_over_each_component_channel
-    channels = [c1 = mock('channel'), c2 = mock('channel'), c3 = mock('channel')]
+    channels = [mock('channel'), mock('channel'), mock('channel')]
     channel = Net::SSH::Multi::Channel.new(mock('session'), channels)
     result = []
     channel.each { |c| result << c }
diff --git a/test/session_actions_test.rb b/test/session_actions_test.rb
index e6de5b1..c9e29d6 100644
--- a/test/session_actions_test.rb
+++ b/test/session_actions_test.rb
@@ -94,7 +94,7 @@ class SessionActionsTest < Minitest::Test
     c.expects(:on_extended_data).yields(c, 1, "stderr")
     c.expects(:on_request)
     results = {}
-    @session.exec("something") do |c, stream, data|
+    @session.exec("something") do |_, stream, data|
       results[stream] = data
     end
     assert_equal({:stdout => "stdout", :stderr => "stderr"}, results)
diff --git a/test/session_test.rb b/test/session_test.rb
index 42a56b2..c027db9 100644
--- a/test/session_test.rb
+++ b/test/session_test.rb
@@ -198,4 +198,25 @@ class SessionTest < Minitest::Test
     IO.expects(:select).with([:a, :b, :c], [:a, :c], nil, 5).returns([[:b, :c], [:a, :c]])
     @session.process(5)
   end
+
+  def test_process_should_pass_minimum_keepalive_interval_as_io_select_timeout
+    @session.use('h1', :keepalive => true)
+    @session.use('h2', :keepalive_interval => 1)
+    @session.use('h3', :keepalive => true, :keepalive_interval => 2)
+    @session.use('h4', :keepalive => true, :keepalive_interval => 3)
+    IO.expects(:select).with([], [], nil, 2)
+    @session.process
+  end
+
+  def test_process_should_pass_wait_as_io_select_timeout_if_provided_and_minimum
+    @session.use('h1', :keepalive => true, :keepalive_interval => 1)
+    IO.expects(:select).with([], [], nil, 1)
+    @session.process(2)
+  end
+
+  def test_process_should_pass_nil_as_io_select_timeout_by_default
+    @session.use('h1')
+    IO.expects(:select).with([], [], nil, nil)
+    @session.process
+  end
 end