beaker-puppet 1.18.12 → 1.18.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f74846dbd9ab793e04e052df3fd3059af667b0b42221c5d4505237f3b57f6074
-  data.tar.gz: ba44e5139f6596f2c3d5501701b4a8bb82bfe0f0b1fbd0f5f9b426344dbca21a
+  metadata.gz: 16fa6b2a09e5b987520d65351e9dd34ede8494a3995ea103468118c3cf1ff269
+  data.tar.gz: 3e0631f16d941336d5247d7caaa4cf861fcc1d860544df109dbc3eae442d16e0
 SHA512:
-  metadata.gz: 3fd8f76111d3226bf9ceee47827c04a3d6163c9f29d2a64496003a9e4b7be39e0821af9b5e8678589d6e2578fb33d8a4bbf94f3c18dbfd50bb24950100fc4ad2
-  data.tar.gz: 71474c705fa2fb388ea95adbca9b23a9883e79735c2d3693e624ffa28d6b682d45b3776c2e8f541a7cc89ad1fdf89975639b2233fc758febec7daf6032816ed0
+  metadata.gz: 3ee81de0a0526bf05c1546f6b07db7ccf049fd13efa504baefd64ac53b9bb52485c1ce6b431bd143421b080266748a036d8f3147d1b8958d7661a0580839a4df
+  data.tar.gz: a8bdb1c26c35d6175bf7bfd8d86761df28828a1eb25dd716b1c2330d6a3af7f9b064bb6a0c360cd2e08fddf6577a37c2a95e2abfb961b5361640cae462c56cdc

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

@@ -118,7 +118,7 @@ module Beaker
           repoconfig_url  = "#{build_url}/#{repoconfig_buildserver_path}" unless repoconfig_buildserver_path.nil?
           artifact_url_correct = link_exists?( artifact_url )
           logger.debug("- artifact url: '#{artifact_url}'. Exists? #{artifact_url_correct}")
-          fail_test('artifact url built incorrectly') unless artifact_url_correct
+          fail_test('artifact url built incorrectly') if !artifact_url_correct
 
           return artifact_url, repoconfig_url
         end
@@ -208,11 +208,10 @@ module Beaker
         #
         # @return nil
         def install_from_build_data_url(project_name, sha_yaml_url, local_hosts = nil)
-          unless link_exists?( sha_yaml_url )
+          if !link_exists?( sha_yaml_url )
             message = <<-EOF
               Unable to locate a downloadable build of #{project_name} (tried #{sha_yaml_url})
             EOF
-
             fail_test( message )
           end
 

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

@@ -46,7 +46,6 @@ module Beaker
           if not host.is_powershell?
             separator = ':'
           end
-
           path.join(separator)
         end
 
@@ -56,7 +55,6 @@ module Beaker
         def add_puppet_paths_on(hosts)
           block_on hosts do | host |
             puppet_path = construct_puppet_path(host)
-
             host.add_env_var('PATH', puppet_path)
             host.add_env_var('PATH', 'PATH') # don't destroy the path!
           end

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

@@ -120,24 +120,19 @@ exit /B %errorlevel%
             begin
               # 1641 = ERROR_SUCCESS_REBOOT_INITIATED
               # 3010 = ERROR_SUCCESS_REBOOT_REQUIRED
-              on host, Command.new(%{"#{batch_path}"}, [], { :cmdexe => true }), :acceptable_exit_codes => [0, 1641, 3010]
+              on host, Command.new("\"#{batch_path}\"", [], { :cmdexe => true }), :acceptable_exit_codes => [0, 1641, 3010]
             rescue
-              on host, Command.new(%{more "#{log_file}"}, [], { :cmdexe => true })
+              on host, Command.new("type \"#{log_file}\"", [], { :cmdexe => true })
               raise
             end
 
             if opts[:debug]
-              on host, Command.new(%{more "#{log_file}"}, [], { :cmdexe => true })
+              on host, Command.new("type \"#{log_file}\"", [], { :cmdexe => true })
             end
 
             if !host.is_cygwin?
-              # Enable the PATH updates
+              # HACK: for some reason, post install we need to refresh the connection to make puppet available for execution
               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
@@ -175,10 +170,10 @@ 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}" more "#{path}"}, [], { :cmdexe => true }))
+              on host, Command.new("\"if exist #{path} type #{path}\"", [], { :cmdexe => true })
             end
           end
         end
@@ -204,23 +199,25 @@ exit /B %errorlevel%
             begin
               # 1641 = ERROR_SUCCESS_REBOOT_INITIATED
               # 3010 = ERROR_SUCCESS_REBOOT_REQUIRED
-              on host, Command.new(%{"#{batch_path}"}, [], { :cmdexe => true }), :acceptable_exit_codes => [0, 1641, 3010]
+              on host, Command.new("\"#{batch_path}\"", [], { :cmdexe => true }), :acceptable_exit_codes => [0, 1641, 3010]
             rescue
-              on host, Command.new(%{more "#{log_file}"}, [], { :cmdexe => true })
+              on host, Command.new("type \"#{log_file}\"", [], { :cmdexe => true })
               raise
             end
 
             if opts[:debug]
-              on host, Command.new(%{more "#{log_file}"}, [], { :cmdexe => true })
+              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
             end
+
           end
         end
+
       end
     end
   end
-end
+end

data/lib/beaker-puppet/version.rb

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

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

@@ -391,31 +391,16 @@ describe ClassMixedWithDSLInstallUtils do
   end
 
   describe '#install_puppet_agent_from_dev_builds_on' do
-    ref="sha"
-    sha_yaml_url="#{Beaker::DSL::Puppet5::DEFAULT_DEV_BUILDS_URL}/puppet-agent/#{ref}/artifacts/#{ref}.yaml"
-
-    begin
-      require 'net/http'
-
-      Net::HTTP.get(sha_yaml_url)
-    rescue
-      real_world = true
-    end
-
     let(:host) { make_host('test_host', { platform: 'el-7-x86_64' }) }
+    let(:ref) { "sha" }
+    let(:sha_yaml_url) { "#{Beaker::DSL::Puppet5::DEFAULT_DEV_BUILDS_URL}/puppet-agent/#{ref}/artifacts/#{ref}.yaml" }
 
-    if real_world
-      it 'installs puppet-agent from internal builds when they are accessible' do
-        skip('The Puppet development network is not available in the real world')
-      end
-    else
-      it 'installs puppet-agent from internal builds when they are accessible' do
-        expect( subject ).to receive(:block_on).with(anything, :run_in_parallel => true)
-        allow(subject).to receive(:dev_builds_accessible_on?).and_return(true)
-        allow(subject).to receive(:install_from_build_data_url).with('puppet-agent', sha_yaml_url, host)
-        subject.install_puppet_agent_from_dev_builds_on(host, ref)
-        expect(subject).to have_received(:install_from_build_data_url).with('puppet-agent', sha_yaml_url, host)
-      end
+    it 'installs puppet-agent from internal builds when they are accessible' do
+      expect( subject ).to receive(:block_on).with(anything, :run_in_parallel => true)
+      allow(subject).to receive(:dev_builds_accessible_on?).and_return(true)
+      allow(subject).to receive(:install_from_build_data_url).with('puppet-agent', sha_yaml_url, host)
+      subject.install_puppet_agent_from_dev_builds_on(host, ref)
+      expect(subject).to have_received(:install_from_build_data_url).with('puppet-agent', sha_yaml_url, host)
     end
 
     it 'fails the test when internal builds are inaccessible' do

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'),
@@ -42,11 +42,11 @@ describe ClassMixedWithDSLInstallUtils do
 
   def expect_version_log_called(times = hosts.length)
     [
-      %{%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|
       expect( Beaker::Command ).to receive( :new )
-        .with( %{if exist "#{path}" more "#{path}"}, [], {:cmdexe => true} )
+        .with( "\"if exist #{path} type #{path}\"", [], {:cmdexe => true} )
         .exactly( times ).times
     end
   end
@@ -71,25 +71,15 @@ describe ClassMixedWithDSLInstallUtils do
       .exactly(times).times
   end
 
-  def expect_check_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
-      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( :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_check_puppet_path_called
       expect_status_called
       expect_reg_query_called
       expect_version_log_called
@@ -101,7 +91,6 @@ describe ClassMixedWithDSLInstallUtils do
 
     it "allows configuration of PUPPET_AGENT_STARTUP_MODE" do
       expect_install_called
-      expect_check_puppet_path_called
       expect_status_called
       expect_reg_query_called
       expect_version_log_called
@@ -114,9 +103,8 @@ describe ClassMixedWithDSLInstallUtils do
 
     it "will not generate a command to emit a log file without the :debug option set" do
       expect_install_called
-      expect_check_puppet_path_called
       expect_status_called
-      expect( Beaker::Command ).not_to receive( :new ).with( /^more .*\.log$/, [], {:cmdexe => true} )
+      expect( Beaker::Command ).not_to receive( :new ).with( /^type .*\.log$/, [], {:cmdexe => true} )
       subject.install_msi_on(hosts, msi_path)
     end
 
@@ -125,28 +113,25 @@ describe ClassMixedWithDSLInstallUtils do
       hosts_affected = 1
 
       expect_install_called(hosts_affected) { |e| e.and_raise }
-      expect_check_puppet_path_called(0)
       expect_status_called(0)
 
-      expect( Beaker::Command ).to receive( :new ).with( /^more \".*\.log\"$/, [], {:cmdexe => true} ).exactly( hosts_affected ).times
+      expect( Beaker::Command ).to receive( :new ).with( /^type \".*\.log\"$/, [], {:cmdexe => true} ).exactly( hosts_affected ).times
       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_check_puppet_path_called
       expect_status_called
       expect_version_log_called
 
-      expect( Beaker::Command ).to receive( :new ).with( /^more \".*\.log\"$/, [], {:cmdexe => true} ).exactly( hosts.length ).times
+      expect( Beaker::Command ).to receive( :new ).with( /^type \".*\.log\"$/, [], {:cmdexe => true} ).exactly( hosts.length ).times
       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_check_puppet_path_called
       expect_status_called
       expect_version_log_called
       test_path = 'test/path'
@@ -157,7 +142,6 @@ describe ClassMixedWithDSLInstallUtils do
 
     it 'will search in Wow6432Node for the remembered startup setting on 64-bit hosts' do
       expect_install_called
-      expect_check_puppet_path_called
       expect_status_called
       expect_version_log_called
 
@@ -174,7 +158,6 @@ describe ClassMixedWithDSLInstallUtils do
 
     it 'will omit Wow6432Node in the registry search for remembered startup setting on 32-bit hosts' do
       expect_install_called
-      expect_check_puppet_path_called
       expect_status_called
       expect_version_log_called
 
@@ -277,4 +260,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.12
+  version: 1.18.13
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-06 00:00:00.000000000 Z
+date: 2020-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec