beaker 4.8.0 → 4.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b271889e27629318af4cfeae6f5a96b67f06305a
-  data.tar.gz: 5a072c8fbdacdaafcf225362f86bd1d0eb873421
+  metadata.gz: aaccea8cc8165229c874ea04ca98c7a9cf8f2f6b
+  data.tar.gz: 399f13de4b1d8f2e420aa0c77325d9feecbe2ba6
 SHA512:
-  metadata.gz: ac3ef7b50eb426948b40cc602b7cc3523296a8a5e1b336c629f6c33fddd5b8f517402bf2295f3df2e0b2181c300a771e86a698d174ce4abcb4c852ed96fbd02e
-  data.tar.gz: 07a6a12a9433cf6b1c9486657463fb5795995bdc765baa5219fb1d0987960bb55415d350624979043b7842deee290df96d0506a90d4ec18258570bfed1804425
+  metadata.gz: b0b10ca3c14140283f5b6379e679db95f67cf8bb00579c491628908c8274486e6dea92f626602ab5ef8bf678208a52b74c62fe8a65affaad4e7ab3d231d5905b
+  data.tar.gz: 7e60c41932f7947b7d8ab96263faab067a7780670a6401bada39b7365aec2ef8d2f19e67587dd54464e910d2dc5cebdc193bd82c80f9f828d7c8c4d0f0533aff

data/CHANGELOG.md

@@ -11,7 +11,13 @@ Tracking in this Changelog began for this project in version 3.25.0.
 If you're looking for changes from before this, refer to the project's
 git logs & PR history.
 
-# [Unreleased](https://github.com/puppetlabs/beaker/compare/4.8.0...master)
+# [Unreleased](https://github.com/puppetlabs/beaker/compare/4.9.0...master)
+
+# [4.9.0](https://github.com/puppetlabs/beaker/compare/4.8.0...4.9.0) - 2019-06-19
+
+### Changed
+
+- SSH Connection failure backoff shortened (BKR-1599)
 
 # [4.8.0](https://github.com/puppetlabs/beaker/compare/4.7.0...4.8.0) - 2019-04-17
 
@@ -21,6 +27,7 @@ git logs & PR history.
 - Codenames for Ubuntu 18.10, 19.04, and 19.10
 
 ### Changed
+
 - Remove "repos-pe" prefix for repo filenames
 
 # [4.7.0](https://github.com/puppetlabs/beaker/compare/4.6.0...4.7.0) - 2019-04-17
@@ -31,6 +38,7 @@ git logs & PR history.
 - enable Solaris10Sparc pkgutil SSL CA2 (IMAGES-844)
 
 ### Changed
+
 - update pry-byebug dependency 3.4.2->3.6 (BKR-1568)
 - disabling hostkey checks for cisco hosts (QENG-7108)
 - Change behavior of ruby versioning to accept job-parameter RUBY\_VER

data/lib/beaker/ssh_connection.rb

@@ -198,28 +198,9 @@ module Beaker
 
     def execute command, options = {}, stdout_callback = nil,
                 stderr_callback = stdout_callback
-      try = 1
-      wait = 1
-      last_wait = 0
-      begin
-        # ensure that we have a current connection object
-        connect
-        result = try_to_execute(command, options, stdout_callback, stderr_callback)
-      rescue *RETRYABLE_EXCEPTIONS => e
-        if try < 11
-           sleep wait
-          (last_wait, wait) = wait, last_wait + wait
-           try += 1
-          @logger.error "Command execution '#{@hostname}$ #{command}' failed (#{e.class.name} - #{e.message})"
-          close
-          @logger.debug "Preparing to retry: closed ssh object"
-          retry
-        else
-          raise
-        end
-      end
-
-      result
+      # ensure that we have a current connection object
+      connect
+      try_to_execute(command, options, stdout_callback, stderr_callback)
     end
 
     def request_terminal_for channel, command

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '4.8.0'
+    STRING = '4.9.0'
   end
 end

data/spec/beaker/ssh_connection_spec.rb

@@ -86,24 +86,11 @@ module Beaker
     end
 
     describe '#execute' do
-      it 'retries if failed with a retryable exception' do
+      it 'raises an error if it fails' do
         mock_ssh = Object.new
         expect( Net::SSH ).to receive( :start ).with( ip, user, ssh_opts) { mock_ssh }
         connection.connect
 
-        allow( subject ).to receive( :close )
-        expect( subject ).to receive( :try_to_execute ).ordered.once { raise Timeout::Error }
-        expect( subject ).to receive( :try_to_execute ).ordered.once { Beaker::Result.new('name', 'ls') }
-        expect( subject ).to_not receive( :try_to_execute )
-        connection.execute('ls')
-      end
-
-      it 'raises an error if it fails both times' do
-        mock_ssh = Object.new
-        expect( Net::SSH ).to receive( :start ).with( ip, user, ssh_opts) { mock_ssh }
-        connection.connect
-
-        allow( subject ).to receive( :close )
         allow( subject ).to receive( :try_to_execute ) { raise Timeout::Error }
 
         expect{ connection.execute('ls') }.to raise_error Timeout::Error

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 4.8.0
+  version: 4.9.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-04 00:00:00.000000000 Z
+date: 2019-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec