beaker-pe 0.9.0 → 0.10.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmJmY2Y3NDAxYjE4YTMwNDM3ZjE3YjczMmRjYWNhMDBkNzI3OGVmMA==
+    NWFhYmVkMTkzMDUwYzk2YTljYTcwNDY4ZDllMjkyYzE4Mjc0MWFmNw==
   data.tar.gz: !binary |-
-    ODQ2Yjc1ZjA4YjdiZGIwZDRiZmM2OWM4ZjAzZGFmMTQ4YTg5ZTc0YQ==
+    MGFhYjc2NjFhOWRjYjJmYTBmOWFlYWJkYTNjYTNlNzQ5ZjVkM2MyZg==
 SHA512:
   metadata.gz: !binary |-
-    YTA5MjVlZjIzOWZhMDhjYzhkNWJmN2I1NGZlMDE3MDAwYjViODY2Yzg1YThl
-    OWUxOGUzYTE0YjBjNDgxNjc5MDJkNjFlNTQ5OGE5YTBjZTM0ZWNlYWQ4MDI1
-    MTE4NDgwMmZmYzEyOTY2NWMyOWY0NWUyNWUxZTE2ODNlYTlmN2M=
+    YWRjNTZiMGMxMWU3ODFkNGU5NzkwMGNiM2Q4NWU3N2NiYzk0OWEyY2YzMWIy
+    NGIxODI5YzVhYzdjOTBmZThiM2JkNmIwNmMwYWQyZmI5MWYxY2UzYWY2Y2Rk
+    ZTMxMDBkNzM5NmM0NWEyNTY1NzA1YzU1Y2Y4YzJiMzhkMjZmMTQ=
   data.tar.gz: !binary |-
-    ZTFlNzRiNWE4MDczNzg5ODg3ZGJjNWFlMjIyZjFiZDA2ZTc5ZmViMmFkYzY2
-    YWI0MDMzYzAxNGFiZjc1ZGY0NDI0YjgxOWYwZDVkMTIwMjNlYTEzZmRkOWYx
-    NjU1MzVlYWJjOTVkNjY0ZDk5MDA2NWIzM2EyNDBlMzFkZTYzM2Y=
+    YzRkZjhjYWQwZmQ0NzVkMmRjZmRhOGQwNDE2YzM2MzkxMjhiMTI2OGY3ZjY0
+    N2RiOTgxZjI3YTlmNWI2NDUwZjBmNzFmZjAwMzc0ZGQyMWMyZWE5YjVhMzNk
+    MTA4NDlkY2Y3ZDJiMGQ1N2U1N2I2YmI5ZTM0YjdhMzQ2MGNhYzc=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 15 Aug, 2016 (01d03513)](#LATEST)
+* [LATEST - 23 Aug, 2016 (1c8df4c3)](#LATEST)
+* [0.9.0 - 15 Aug, 2016 (e29ed491)](#0.9.0)
 * [0.8.0 - 2 Aug, 2016 (b40f583b)](#0.8.0)
 * [0.7.0 - 19 Jul, 2016 (8256c0ac)](#0.7.0)
 * [0.6.0 - 11 Jul, 2016 (e974e7f8)](#0.6.0)
@@ -13,7 +14,23 @@
 * [0.1.0 - 29 Feb, 2016 (4fc88d8c)](#0.1.0)
 
 ## Details
-### <a name = "LATEST">LATEST - 15 Aug, 2016 (01d03513)
+### <a name = "LATEST">LATEST - 23 Aug, 2016 (1c8df4c3)
+
+* (GEM) update beaker-pe version to 0.10.0 (1c8df4c3)
+
+* (BKR-908) added attempts config to console status check (#22) (d5e711de)
+
+
+```
+(BKR-908) added attempts config to console status check (#22)
+
+* (BKR-908) added attempts config to console status check
+
+* (BKR-908) handle JSON::ParserError case
+```
+### <a name = "0.9.0">0.9.0 - 15 Aug, 2016 (e29ed491)
+
+* (HISTORY) update beaker-pe history for gem release 0.9.0 (e29ed491)
 
 * (GEM) update beaker-pe version to 0.9.0 (01d03513)
 

data/lib/beaker-pe/install/pe_utils.rb

@@ -702,23 +702,34 @@ module Beaker
           fail_test "PuppetDB took too long to start"
         end
 
+        # Checks Console Status Endpoint, failing the test if the
+        # endpoints don't report a running state.
+        #
+        # @param [Host] host Host to check status on
+        #
+        # @note Uses the global option's :pe_console_status_attempts
+        #   value to determine how many times it's going to retry the
+        #   check with fibonacci back offs.
+        #
+        # @return nil
         def check_console_status_endpoint(host)
-          if version_is_less(host['pe_ver'], '2015.2.0')
-            return true
-          end
-          Timeout.timeout(60) do
-            match = nil
-            while not match
+          return true if version_is_less(host['pe_ver'], '2015.2.0')
+
+          attempts_limit = @options[:pe_console_status_attempts] || 9
+          step 'Check Console Status Endpoint' do
+            match = repeat_fibonacci_style_for(attempts_limit) do
               output = on(host, "curl -s -k https://localhost:4433/status/v1/services --cert /etc/puppetlabs/puppet/ssl/certs/#{host}.pem --key /etc/puppetlabs/puppet/ssl/private_keys/#{host}.pem --cacert /etc/puppetlabs/puppet/ssl/certs/ca.pem", :accept_all_exit_codes => true)
-              output = JSON.parse(output.stdout)
-              match = output['classifier-service']['state'] == 'running'
-              match = match && output['rbac-service']['state'] == 'running'
-              match = match && output['activity-service']['state'] == 'running'
-              sleep 1
+              begin
+                output = JSON.parse(output.stdout)
+                match = output['classifier-service']['state'] == 'running'
+                match = match && output['rbac-service']['state'] == 'running'
+                match && output['activity-service']['state'] == 'running'
+              rescue JSON::ParserError
+                false
+              end
             end
+            fail_test 'Console services took too long to start' if !match
           end
-        rescue Timeout::Error
-          fail_test "Console services took too long to start"
         end
 
         #Install PE based upon host configuration and options

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '0.9.0'
+        STRING = '0.10.0'
       end
 
     end

data/spec/beaker-pe/install/pe_utils_spec.rb

@@ -1202,4 +1202,65 @@ describe ClassMixedWithDSLInstallUtils do
     end
   end
 
+  describe '#check_console_status_endpoint' do
+
+    it 'does not do anything if version is less than 2015.2.0' do
+      allow(subject).to receive(:version_is_less).and_return(true)
+
+      global_options = subject.instance_variable_get(:@options)
+      expect(global_options).not_to receive(:[]).with(:pe_console_status_attempts)
+      subject.check_console_status_endpoint({})
+    end
+
+    it 'allows the number of attempts to be configured via the global options' do
+      attempts = 37819
+      options = {:pe_console_status_attempts => attempts}
+      subject.instance_variable_set(:@options, options)
+      allow(subject).to receive(:version_is_less).and_return(false)
+      allow(subject).to receive(:fail_test)
+
+      expect(subject).to receive(:repeat_fibonacci_style_for).with(attempts)
+      subject.check_console_status_endpoint({})
+    end
+
+    it 'yields false to repeat_fibonacci_style_for when conditions are not true' do
+      subject.instance_variable_set(:@options, {})
+      allow(subject).to receive(:version_is_less).and_return(false)
+      allow(subject).to receive(:sleep)
+
+      output_hash = {
+        'classifier-service' => {}
+      }
+      output_stub = Object.new
+      allow(output_stub).to receive(:stdout)
+      expect(subject).to receive(:on).exactly(9).times.and_return(output_stub)
+      allow(JSON).to receive(:parse).and_return(output_hash)
+      allow(subject).to receive(:fail_test)
+      subject.check_console_status_endpoint({})
+    end
+
+    it 'yields false to repeat_fibonacci_style_for when JSON::ParserError occurs' do
+      subject.instance_variable_set(:@options, {})
+      allow(subject).to receive(:version_is_less).and_return(false)
+      allow(subject).to receive(:sleep)
+
+      output_stub = Object.new
+      # empty string causes JSON::ParserError
+      allow(output_stub).to receive(:stdout).and_return('')
+      expect(subject).to receive(:on).exactly(9).times.and_return(output_stub)
+      allow(subject).to receive(:fail_test)
+      subject.check_console_status_endpoint({})
+    end
+
+    it 'calls fail_test when no checks pass' do
+      subject.instance_variable_set(:@options, {})
+      allow(subject).to receive(:version_is_less).and_return(false)
+
+      allow(subject).to receive(:repeat_fibonacci_style_for).and_return(false)
+      expect(subject).to receive(:fail_test)
+      subject.check_console_status_endpoint({})
+    end
+
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec