beaker-pe 1.37.0 → 1.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87e34e4ec7fa04f50f10ba94ced6ba07747fe830
-  data.tar.gz: 575b16a5a7f5e89286308d84fdb6401b06e786f6
+  metadata.gz: 27e92eecfdcc213e61799677bec5ed8bd276066e
+  data.tar.gz: e90e286369a943c793b2dff3b4311ff777b0a252
 SHA512:
-  metadata.gz: 15a4439aa82bb097e1fe5b7842604947e23e247a21e7c3dd62d4af8789afd5020f68c7b552f3c28008eeedca280c252de1f3fc2dd4ef15c31de141de9d3aaf8a
-  data.tar.gz: 80110427e1ca5bf345849d4339ab67ffe7a804878d52e3290110114ae179df43579b92f9d6bbc64dacadcfd1f40d9aea75f50b804636ddd396b8d2dc7e5cd278
+  metadata.gz: 5f6106081204c645a007bb513f5e8ead7fe4d163ba532e5c6f0ae5f5d5c04899dae7f38079af907e791bbece8d52ebca6afc8fa84e94cf741f80800de9f464ff
+  data.tar.gz: 73f71045099372b06f175d014a12b589be56ea93ef2370067daf577bd651232f67c877117e86306db405380b5ff1a6d2385b2b15c080a4c1f1a67302f1b8d292

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

@@ -1427,7 +1427,7 @@ module Beaker
                 installer_log_dir = '/var/log/puppetlabs/installer'
                 latest_installer_log_file = on(master, "ls -1t #{installer_log_dir} | head -n1").stdout.chomp
                 #Check the lastest install log to confirm the expected failure is there
-                unless on(master, "grep 'The operation could not be completed because RBACs database has not been initialized' #{installer_log_dir}/#{latest_installer_log_file}")
+                unless on(master, "grep 'The operation could not be completed because RBACs database has not been initialized' #{installer_log_dir}/#{latest_installer_log_file}", :acceptable_exit_codes => [0,1]).exit_code == 0
                   raise "Install on master failed in an unexpected manner"
                 end
               end

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '1.37.0'
+        STRING = '1.38.0'
       end
 
     end

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

@@ -1213,8 +1213,10 @@ describe ClassMixedWithDSLInstallUtils do
       #Error handling
       @installer_log_file_name = Beaker::Result.new( {}, '' )
       @installer_log_file_name.stdout = "installer_log_name"
+      exit_code_mock = Object.new
+      allow(exit_code_mock).to receive(:exit_code).and_return( 0 )
       allow(subject).to receive(:on).with(mono_master, "ls -1t /var/log/puppetlabs/installer | head -n1").and_return(@installer_log_file_name)
-      allow(subject).to receive(:on).with(mono_master, "grep 'The operation could not be completed because RBACs database has not been initialized' /var/log/puppetlabs/installer/installer_log_name").and_return(true)
+      allow(subject).to receive(:on).with(mono_master, "grep 'The operation could not be completed because RBACs database has not been initialized' /var/log/puppetlabs/installer/installer_log_name", :acceptable_exit_codes=>[0, 1]).and_return(exit_code_mock)
 
       allow(subject).to receive(:execute_installer_cmd).with(pe_postgres, {}).once
       expect(subject).to receive(:execute_installer_cmd).with(mono_master, {}).once.ordered
@@ -1243,8 +1245,10 @@ describe ClassMixedWithDSLInstallUtils do
       #Error handling
       @installer_log_file_name = Beaker::Result.new( {}, '' )
       @installer_log_file_name.stdout = "installer_log_name"
+      exit_code_mock = Object.new
+      allow(exit_code_mock).to receive(:exit_code).and_return(1)
       allow(subject).to receive(:on).with(mono_master, "ls -1t /var/log/puppetlabs/installer | head -n1").and_return(@installer_log_file_name)
-      allow(subject).to receive(:on).with(mono_master, "grep 'The operation could not be completed because RBACs database has not been initialized' /var/log/puppetlabs/installer/installer_log_name").and_return(false)
+      allow(subject).to receive(:on).with(mono_master, "grep 'The operation could not be completed because RBACs database has not been initialized' /var/log/puppetlabs/installer/installer_log_name", :acceptable_exit_codes=>[0, 1]).and_return(exit_code_mock)
 
       expect{ subject.do_install_pe_with_pe_managed_external_postgres([mono_master, pe_postgres, agent], {}) }.to raise_error(RuntimeError, "Install on master failed in an unexpected manner")
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 1.37.0
+  version: 1.38.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-20 00:00:00.000000000 Z
+date: 2018-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec