Merge pull request #57 from akuma12/master

Add Net::SSH::Exception to list of caught SSH errors
envato · Jul 1, 2021 · 194d0bf · 194d0bf
2 parents 1755264 + 03d4250
commit 194d0bf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/ami_spec/wait_for_ssh.rb b/lib/ami_spec/wait_for_ssh.rb
@@ -9,7 +9,7 @@ def self.wait(ip_address, user, key, max_retries)
  while retries < max_retries
  begin
  Net::SSH.start(ip_address, user, keys: [key], :verify_host_key => :never) { |ssh| ssh.exec 'echo boo!' }
- rescue Errno::ETIMEDOUT, Errno::ECONNREFUSED, Timeout::Error => error
+ rescue Errno::ETIMEDOUT, Errno::ECONNREFUSED, Timeout::Error, Net::SSH::Exception => error
  last_error = error
  sleep 1
  else

diff --git a/spec/wait_for_ssh_spec.rb b/spec/wait_for_ssh_spec.rb
@@ -23,7 +23,7 @@
  end
 
  it 'returns the last error' do
- expect(Net::SSH).to receive(:start).and_raise(Errno::ECONNREFUSED, 'some other error')
+ expect(Net::SSH).to receive(:start).and_raise(Net::SSH::ConnectionTimeout, 'some other error')
  expect{subject}.to raise_error(AmiSpec::InstanceConnectionTimeout, /ssh failed/)
  end