beaker 4.11.0 → 4.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e9ddb99c16ca4103cc2836b35a440dc9db6db6f
-  data.tar.gz: eff6a1f77989d1a28e1e488d99eaa7d89677ded0
+  metadata.gz: c1a8549e026be5a3fa83b131174cab1fe2407950
+  data.tar.gz: 0ca7f821905cc7195e0c05bdf47aa440e85bf9db
 SHA512:
-  metadata.gz: f19c58ffdfb656152da9c875e61dd12b8ac7b2a96b8186c04c5b791ffc907e7571c23be0b8db3b0c37751d0d25585f681226239847b88d5c1819a496cc97fa58
-  data.tar.gz: fe6f360fd641e876a0193d1561506ffe8efa716d9904be6a13ba55763a65050e7e16881077c5f22ca796bfce9cb34601046e5970bd31c9dab12a9ee5920d61a8
+  metadata.gz: 340af3a743fefc91288adba7e6105de325f6b3f023559e72bb9969e14dce916514fe47fb978bdbbafc25f701d41776afb471dbf3c45b24259c3404f8cc2f251c
+  data.tar.gz: 8e7b8dad8e1cdd62d063cabae50cb6b2090b74e68429fa803e93da905d781a0d9bd2117d5b0adec3c75655e2118a82df775068192b9d4ad462198685b2f9bda6

data/CHANGELOG.md

@@ -13,6 +13,12 @@ git logs & PR history.
 
 # [Unreleased](https://github.com/puppetlabs/beaker/compare/4.11.0...master)
 
+# [4.11.1](https://github.com/puppetlabs/beaker/compare/4.11.0...4.11.1) - 2019-08-13
+
+### Changed
+
+- `host.down?`'s wait from a fibonacci to a constant wait (BKR-1595)
+
 # [4.11.0](https://github.com/puppetlabs/beaker/compare/4.10.0...4.11.0) - 2019-07-22
 
 ### Added

data/lib/beaker/host.rb

@@ -599,7 +599,8 @@ module Beaker
     def down?
       @logger.debug("host.down?: checking if host has gone down using ping...")
       host_up = true
-      repeat_fibonacci_style_for 11 do
+      # give it max 3 minutes to go down, check every 10 seconds
+      repeat_for_and_wait 180, 10 do
         host_up = self.ping?
         @logger.debug("- ping result: #{host_up}. Done checking? #{!host_up}")
         !host_up # host down? -> continue looping. up? -> finished

data/lib/beaker/shared/repetition.rb

@@ -3,10 +3,16 @@ module Beaker
     module Repetition
 
       def repeat_for seconds, &block
+        # do not peg CPU if &block takes less than 1 second
+        repeat_for_and_wait seconds, 1, &block
+      end
+
+      def repeat_for_and_wait seconds, wait, &block
         timeout = Time.now + seconds
         done = false
         until done or timeout < Time.now do
           done = block.call
+          sleep wait unless done
         end
         return done
       end

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '4.11.0'
+    STRING = '4.11.1'
   end
 end

data/spec/beaker/host_spec.rb

@@ -827,12 +827,11 @@ module Beaker
 
     describe "#down?" do
 
-      it "repeats 11 times & fails if ping never returns false" do
-        allow(host).to receive(:sleep)
-        expect(host).to receive(:ping?).exactly(11).times.and_return(true)
+      it "repeats & fails with 'failed to go down' after X seconds" do
+        allow(host).to receive(:repeat_for_and_wait).with(180,10).and_return(false)
         expect {
           host.down?
-        }.to raise_error(Beaker::Host::RebootFailure, /failed to go down/)
+        }.to raise_error(Beaker::Host::RebootFailure, "Host failed to go down")
       end
 
       it "returns that the host is down (true) if ping? is false" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 4.11.0
+  version: 4.11.1
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-22 00:00:00.000000000 Z
+date: 2019-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec