beaker 4.9.0 → 4.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aaccea8cc8165229c874ea04ca98c7a9cf8f2f6b
-  data.tar.gz: 399f13de4b1d8f2e420aa0c77325d9feecbe2ba6
+  metadata.gz: e7c29f137a2fc6b34d0503cd2e0db009a3b42dff
+  data.tar.gz: 8036e85ce20e94d978d300d257dba7480cd13a98
 SHA512:
-  metadata.gz: b0b10ca3c14140283f5b6379e679db95f67cf8bb00579c491628908c8274486e6dea92f626602ab5ef8bf678208a52b74c62fe8a65affaad4e7ab3d231d5905b
-  data.tar.gz: 7e60c41932f7947b7d8ab96263faab067a7780670a6401bada39b7365aec2ef8d2f19e67587dd54464e910d2dc5cebdc193bd82c80f9f828d7c8c4d0f0533aff
+  metadata.gz: 692f011aa278495d2d45790412abe987e54b36297088f0826527f1e267df9b9e5d9d17858cf070c97a691e5de9fd1bb3d68b6f2f97c3374dfd00c9057a8a6354
+  data.tar.gz: 7ac79722b6a8679366cb4f73517b13a2b0e410846b6c1ff4ce7e0d51dca8c7a2ead15e29c9b25347a68b356f80d71ce8c58126807dea7d9d92c937ad39af8fbe

data/beaker.gemspec

@@ -45,6 +45,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'hocon', '~> 1.0'
   s.add_runtime_dependency 'net-ssh', '~> 5.0'
   s.add_runtime_dependency 'net-scp', '~> 1.2'
+  s.add_runtime_dependency 'net-ping', '~> 2.0'
   s.add_runtime_dependency 'inifile', '~> 3.0'
 
   s.add_runtime_dependency 'rsync', '~> 1.0.9'

data/lib/beaker/host.rb

@@ -2,6 +2,7 @@ require 'socket'
 require 'timeout'
 require 'benchmark'
 require 'rsync'
+require 'net/ping'
 
 require 'beaker/dsl/helpers'
 require 'beaker/dsl/patterns'
@@ -18,6 +19,7 @@ module Beaker
     include Beaker::DSL::Patterns
 
     class CommandFailure < StandardError; end
+    class RebootFailure < CommandFailure; end
 
     # This class provides array syntax for using puppet --configprint on a host
     class PuppetConfigReader
@@ -575,6 +577,25 @@ module Beaker
       raise Beaker::Host::CommandFailure, result.error
     end
 
+    def ping?
+      check = Net::Ping::External.new(self)
+      check.ping?
+    end
+
+    def down?
+      @logger.debug("host.down?: checking if host has gone down using ping...")
+      host_up = true
+      repeat_fibonacci_style_for 11 do
+        host_up = self.ping?
+        @logger.debug("- ping result: #{host_up}. Done checking? #{!host_up}")
+        !host_up # host down? -> continue looping. up? -> finished
+      end
+      if host_up
+        raise Beaker::Host::RebootFailure, 'Host failed to go down'
+      end
+      @logger.debug("host.down? host stopped responding, returning true")
+      true
+    end
   end
 
   [

data/lib/beaker/host/unix/exec.rb

@@ -7,7 +7,14 @@ module Unix::Exec
     else
       exec(Beaker::Command.new("/sbin/shutdown -r now"), :expect_connection_failure => true)
     end
-    sleep(10) #if we attempt a reconnect too quickly we end up blocking ¯\_(ツ)_/¯
+    down? # Verify the host went down
+    begin
+      exec(Beaker::Command.new("exit"))
+    rescue Beaker::Host::CommandFailure => e
+      raise Beaker::Host::RebootFailure, "Command failed in reboot: #{e.message}"
+    rescue Exception => e
+      raise Beaker::Host::RebootFailure, "Unexpected exception in reboot: #{e.message}"
+    end
   end
 
   def echo(msg, abs=true)

data/lib/beaker/shared/repetition.rb

@@ -18,7 +18,7 @@ module Beaker
         while not done and attempt <= attempts do
           done = block.call
           attempt += 1
-          sleep wait
+          sleep wait unless done
           last_wait, wait = wait, last_wait + wait
         end
         return done

data/lib/beaker/version.rb

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

data/spec/beaker/host/unix/exec_spec.rb

@@ -157,5 +157,21 @@ module Beaker
         expect(instance.selinux_enabled?).to be === false
       end
     end
+
+    describe '#reboot' do
+      before :each do
+        expect(instance).to receive(:exec).and_return(false)
+        expect(instance).to receive(:down?)
+      end
+      it 'raises a reboot failure when command fails' do
+        expect(instance).to receive(:exec).and_raise(Host::CommandFailure)
+        expect{ instance.reboot }.to raise_error(Beaker::Host::RebootFailure, /Command failed in reboot: .*/)
+      end
+
+      it 'raises a reboot failure when we receive an unexpected error' do
+        expect(instance).to receive(:exec).and_raise(Net::SSH::HostKeyError)
+        expect{ instance.reboot }.to raise_error(Beaker::Host::RebootFailure, /Unexpected exception in reboot: .*/)
+      end
+    end
   end
 end

data/spec/beaker/host_spec.rb

@@ -824,5 +824,30 @@ module Beaker
         expect(host.wait_for_port(22, 0)).to be false
       end
     end
+
+    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)
+        expect {
+          host.down?
+        }.to raise_error(Beaker::Host::RebootFailure, /failed to go down/)
+      end
+
+      it "returns that the host is down (true) if ping? is false" do
+        expect(host).to receive(:ping?).exactly(1).times.and_return(false)
+
+        expect(host.down?).to be true
+      end
+
+      it "cuts off execution correctly if host becomes unreachable" do
+        expect(host).to receive(:sleep).exactly(3).times
+        expect(host).to receive(:ping?).exactly(3).times.and_return(true).ordered
+        expect(host).to receive(:ping?).exactly(1).times.and_return(false).ordered
+
+        expect(host.down?).to be true
+      end
+    end
   end
 end

data/spec/beaker/shared/repetition_spec.rb

@@ -4,7 +4,7 @@ module Beaker
   module Shared
     describe Repetition do
 
-      context 'repeat_for' do
+      describe '#repeat_for' do
         it "repeats a block for 5 seconds" do
           allow( Time ).to receive( :now ).and_return( 0, 1, 2, 3, 4, 5, 6 )
 
@@ -30,12 +30,13 @@ module Beaker
 
       end
 
-      context 'repeat_fibonacci_style_for' do
-        it "sleeps in fibonacci increasing intervals" do
+      describe '#repeat_fibonacci_style_for' do
+        let(:block) { double("block") }
 
-          block = double( 'block' )
+        it "sleeps in fibonacci increasing intervals" do
           expect( block ).to receive( :exec ).exactly( 5 ).times.and_return( false )
           allow( subject ).to receive( 'sleep' ).and_return( true )
+
           expect( subject ).to receive( :sleep ).with( 1 ).exactly( 2 ).times
           expect( subject ).to receive( :sleep ).with( 2 ).once
           expect( subject ).to receive( :sleep ).with( 3 ).once
@@ -45,25 +46,46 @@ module Beaker
           subject.repeat_fibonacci_style_for( 5 ) do
             block.exec
           end
-
         end
 
-        it "should short circuit if the block is complete" do
+        it "should short circuit if the block succeeds (returns true)" do
+          expect(block).to receive(:exec).and_return(false).ordered.exactly(4).times
+          expect(block).to receive(:exec).and_return( true).ordered.once
 
-          block = double( 'block' )
-          expect( block ).to receive( :exec ).once.and_return( true )
-          allow( subject ).to receive( 'sleep' ).and_return( true )
-          expect( subject ).to receive( :sleep ).with( 1 ).once
-          expect( subject ).to receive( :sleep ).with( 2 ).never
-          expect( subject ).to receive( :sleep ).with( 3 ).never
-          expect( subject ).to receive( :sleep ).with( 5 ).never
-          expect( subject ).to receive( :sleep ).with( 8 ).never
+          expect(subject).to receive(:sleep).with(1).exactly(2).times
+          expect(subject).to receive(:sleep).with(2).once
+          expect(subject).to receive(:sleep).with(3).once
+          expect(subject).to receive(:sleep).with(anything).never
 
-          subject.repeat_fibonacci_style_for( 5 ) do
+          subject.repeat_fibonacci_style_for(20) do
             block.exec
           end
+        end
+
+        it "returns false if block never returns that it is done (true)" do
+          expect(block).to receive(:abcd).exactly(3).times.and_return(false)
+
+          expect(subject).to receive(:sleep).with(1).exactly(2).times
+          expect(subject).to receive(:sleep).with(2).once
+          expect(subject).to receive(:sleep).with(anything).never
 
+          success_result = subject.repeat_fibonacci_style_for(3) do
+            block.abcd
+          end
+          expect(success_result).to be false
         end
+
+        it "never sleeps if block is successful right at first (returns true)" do
+          expect(block).to receive(:fake01).once.and_return(true)
+
+          expect(subject).to receive(:sleep).never
+
+          subject.repeat_fibonacci_style_for(3) do
+            block.fake01
+          end
+        end
+
+
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 4.9.0
+  version: 4.10.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-19 00:00:00.000000000 Z
+date: 2019-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -240,6 +240,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: net-ping
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement