beaker-puppet 1.18.13 → 1.18.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16fa6b2a09e5b987520d65351e9dd34ede8494a3995ea103468118c3cf1ff269
-  data.tar.gz: 3e0631f16d941336d5247d7caaa4cf861fcc1d860544df109dbc3eae442d16e0
+  metadata.gz: 3b61d545a1c2daedf8db34d1022483acc0ccd04632bb0bee75dc31b944e7fd3e
+  data.tar.gz: 188fe64c83a71c7b7993990c66f6da3c9533925a69ba5c94254808f02709b8e5
 SHA512:
-  metadata.gz: 3ee81de0a0526bf05c1546f6b07db7ccf049fd13efa504baefd64ac53b9bb52485c1ce6b431bd143421b080266748a036d8f3147d1b8958d7661a0580839a4df
-  data.tar.gz: a8bdb1c26c35d6175bf7bfd8d86761df28828a1eb25dd716b1c2330d6a3af7f9b064bb6a0c360cd2e08fddf6577a37c2a95e2abfb961b5361640cae462c56cdc
+  metadata.gz: ec8bcf9a562252bf3ea35d721399e3b96d4811bfba3a060100af5300bef787af7ca0fce736c0aa8e4a3d9d67901ee7b4ace4957cfa9d321a8227fa9d84a39f83
+  data.tar.gz: 62fe04f6113bd92d51215a40cca5bc4433411ab421366c70e532e380983064d1d4b2666771e099893cb3e4dcc206acf64ad557fdd3e8f8f02c09c4e3ac10303c

data/Gemfile

@@ -16,7 +16,7 @@ end
 
 
 group :test do
-  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 4.0')
+  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || ['>= 4.16.0', '< 5.0.0'])
   gem "beaker-abs", *location_for(ENV['ABS_VERSION'] || '~> 0.4.0')
 end
 

data/lib/beaker-puppet/install_utils/foss_utils.rb

@@ -692,9 +692,8 @@ module Beaker
             install_msi_on(host, msi_download_path, {}, opts)
 
             configure_type_defaults_on( host )
-            if not host.is_cygwin?
-              host.mkdir_p host['distmoduledir']
-            end
+
+            host.mkdir_p host['distmoduledir'] unless host.is_cygwin?
           end
         end
 

data/lib/beaker-puppet/install_utils/windows_utils.rb

@@ -32,9 +32,9 @@ module Beaker
 
           # msiexec requires quotes around paths with backslashes - c:\ or file://c:\
           # not strictly needed for http:// but it simplifies this code
-          batch_contents = <<-BATCH
-start /w msiexec.exe /i \"#{msi_path}\" /qn /L*V #{log_path} #{msi_params}
-exit /B %errorlevel%
+          batch_contents = <<~BATCH
+            start /w msiexec.exe /i \"#{msi_path}\" /qn /L*V #{log_path} #{msi_params}
+            exit /B %errorlevel%
           BATCH
         end
 
@@ -122,17 +122,22 @@ exit /B %errorlevel%
               # 3010 = ERROR_SUCCESS_REBOOT_REQUIRED
               on host, Command.new("\"#{batch_path}\"", [], { :cmdexe => true }), :acceptable_exit_codes => [0, 1641, 3010]
             rescue
-              on host, Command.new("type \"#{log_file}\"", [], { :cmdexe => true })
+              logger.info(file_contents_on(host, log_file))
               raise
             end
 
             if opts[:debug]
-              on host, Command.new("type \"#{log_file}\"", [], { :cmdexe => true })
+              logger.info(file_contents_on(host, log_file))
             end
 
-            if !host.is_cygwin?
-              # HACK: for some reason, post install we need to refresh the connection to make puppet available for execution
+            unless host.is_cygwin?
+              # Enable the PATH updates
               host.close
+
+              # Some systems require a full reboot to trigger the enabled path
+              unless on(host, Command.new('puppet -h', [], { :cmdexe => true}), :accept_all_exit_codes => true).exit_code == 0
+                host.reboot
+              end
             end
 
             # verify service status post install
@@ -170,10 +175,12 @@ exit /B %errorlevel%
             # emit the misc/versions.txt file which contains component versions for
             # puppet, facter, hiera, pxp-agent, packaging and vendored Ruby
             [
-              "\\\"%ProgramFiles%\\Puppet Labs\\puppet\\misc\\versions.txt\\\"",
-              "\\\"%ProgramFiles(x86)%\\Puppet Labs\\puppet\\misc\\versions.txt\\\""
+              '%ProgramFiles%/Puppet Labs/puppet/misc/versions.txt',
+              '%ProgramFiles(x86)%/Puppet Labs/puppet/misc/versions.txt'
             ].each do |path|
-              on host, Command.new("\"if exist #{path} type #{path}\"", [], { :cmdexe => true })
+              if file_exists_on(host, path)
+                logger.info(file_contents_on(host, path)) && break
+              end
             end
           end
         end
@@ -201,23 +208,19 @@ exit /B %errorlevel%
               # 3010 = ERROR_SUCCESS_REBOOT_REQUIRED
               on host, Command.new("\"#{batch_path}\"", [], { :cmdexe => true }), :acceptable_exit_codes => [0, 1641, 3010]
             rescue
-              on host, Command.new("type \"#{log_file}\"", [], { :cmdexe => true })
+              logger.info(file_contents_on(host, log_file))
+
               raise
             end
 
             if opts[:debug]
-              on host, Command.new("type \"#{log_file}\"", [], { :cmdexe => true })
-            end
-
-            if !host.is_cygwin?
-              # HACK: for some reason, post install we need to refresh the connection to make puppet available for execution
-              host.close
+              logger.info(file_contents_on(host, log_file))
             end
 
+            host.close unless host.is_cygwin?
           end
         end
-
       end
     end
   end
-end
+end

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '1.18.13'
+  VERSION = '1.18.14'
 end

data/spec/beaker-puppet/install_utils/windows_utils_spec.rb

@@ -12,7 +12,7 @@ end
 
 describe ClassMixedWithDSLInstallUtils do
   let(:windows_temp)        { 'C:\\Windows\\Temp' }
-  let( :batch_path )        { '/fake/batch/path' }
+  let(:batch_path )         { '/fake/batch/path' }
   let(:msi_path)            { 'c:\\foo\\puppet.msi' }
   let(:winhost)             { make_host( 'winhost',
                             { :platform => Beaker::Platform.new('windows-2008r2-64'),
@@ -41,14 +41,16 @@ describe ClassMixedWithDSLInstallUtils do
   end
 
   def expect_version_log_called(times = hosts.length)
-    [
-      "\\\"%ProgramFiles%\\Puppet Labs\\puppet\\misc\\versions.txt\\\"",
-      "\\\"%ProgramFiles(x86)%\\Puppet Labs\\puppet\\misc\\versions.txt\\\"",
-    ].each do |path|
-      expect( Beaker::Command ).to receive( :new )
-        .with( "\"if exist #{path} type #{path}\"", [], {:cmdexe => true} )
-        .exactly( times ).times
-    end
+    path = %{%ProgramFiles%/Puppet Labs/puppet/misc/versions.txt}
+
+    expect( subject ).to receive( :file_exists_on )
+      .with(anything, path)
+      .exactly( times ).times
+      .and_return(true)
+
+    expect( subject ).to receive( :file_contents_on )
+      .with(anything, path)
+      .exactly( times ).times
   end
 
   def expect_script_matches(hosts, contents)
@@ -71,15 +73,27 @@ describe ClassMixedWithDSLInstallUtils do
       .exactly(times).times
   end
 
+  def expect_puppet_path_called(times = 1)
+    expect( Beaker::Command ).to receive( :new )
+      .with( 'puppet -h', [], {:cmdexe => true} )
+      .exactly( times ).times
+  end
+
   describe "#install_msi_on" do
     let( :log_file )    { '/fake/log/file.log' }
+
     before :each do
-      allow( subject ).to receive( :on ).and_return( true )
+      exit_code_result = Beaker::Result.new(nil, 'temp')
+      exit_code_result.exit_code = 0
+
+      allow( subject ).to receive( :on ).and_return( exit_code_result )
+      allow( subject ).to receive( :file_exists_on ).and_return(true)
       allow( subject ).to receive( :create_install_msi_batch_on ).and_return( [batch_path, log_file] )
     end
 
     it "will specify a PUPPET_AGENT_STARTUP_MODE of Manual (disabling the service) by default" do
       expect_install_called
+      expect_puppet_path_called
       expect_status_called
       expect_reg_query_called
       expect_version_log_called
@@ -91,6 +105,7 @@ describe ClassMixedWithDSLInstallUtils do
 
     it "allows configuration of PUPPET_AGENT_STARTUP_MODE" do
       expect_install_called
+      expect_puppet_path_called
       expect_status_called
       expect_reg_query_called
       expect_version_log_called
@@ -103,8 +118,13 @@ describe ClassMixedWithDSLInstallUtils do
 
     it "will not generate a command to emit a log file without the :debug option set" do
       expect_install_called
+      expect_puppet_path_called
       expect_status_called
-      expect( Beaker::Command ).not_to receive( :new ).with( /^type .*\.log$/, [], {:cmdexe => true} )
+      expect_reg_query_called
+      expect_version_log_called
+
+      expect( subject ).to receive( :file_contents_on ).with(anything, log_file).never
+
       subject.install_msi_on(hosts, msi_path)
     end
 
@@ -115,23 +135,26 @@ describe ClassMixedWithDSLInstallUtils do
       expect_install_called(hosts_affected) { |e| e.and_raise }
       expect_status_called(0)
 
-      expect( Beaker::Command ).to receive( :new ).with( /^type \".*\.log\"$/, [], {:cmdexe => true} ).exactly( hosts_affected ).times
+      expect( subject ).to receive( :file_contents_on ).with(anything, log_file)
       expect { subject.install_msi_on(hosts, msi_path) }.to raise_error(RuntimeError)
     end
 
     it "will generate a command to emit a log file with the :debug option set" do
       expect_install_called
       expect_reg_query_called
+      expect_puppet_path_called
       expect_status_called
       expect_version_log_called
 
-      expect( Beaker::Command ).to receive( :new ).with( /^type \".*\.log\"$/, [], {:cmdexe => true} ).exactly( hosts.length ).times
+      expect( subject ).to receive( :file_contents_on ).with(anything, log_file).twice
+
       subject.install_msi_on(hosts, msi_path, {}, { :debug => true })
     end
 
     it 'will pass msi_path to #create_install_msi_batch_on as-is' do
       expect_install_called
       expect_reg_query_called
+      expect_puppet_path_called
       expect_status_called
       expect_version_log_called
       test_path = 'test/path'
@@ -142,6 +165,7 @@ describe ClassMixedWithDSLInstallUtils do
 
     it 'will search in Wow6432Node for the remembered startup setting on 64-bit hosts' do
       expect_install_called
+      expect_puppet_path_called
       expect_status_called
       expect_version_log_called
 
@@ -158,6 +182,7 @@ describe ClassMixedWithDSLInstallUtils do
 
     it 'will omit Wow6432Node in the registry search for remembered startup setting on 32-bit hosts' do
       expect_install_called
+      expect_puppet_path_called
       expect_status_called
       expect_version_log_called
 
@@ -260,4 +285,4 @@ describe ClassMixedWithDSLInstallUtils do
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 1.18.13
+  version: 1.18.14
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-07 00:00:00.000000000 Z
+date: 2020-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec