puppet 6.1.0-x86-mingw32 → 6.2.0-x86-mingw32

data/spec/unit/pops/model/pn_transformer_spec.rb

@@ -42,6 +42,10 @@ describe 'Puppet::Pops::Model::PNTransformer' do
       expect(Puppet::Pops::Model::PNTransformer.transform(x.model)).to eq(
         call('hash', call('=>', 'a', 1), call('=>', 'b', 2)))
     end
+
+    it 'replaces empty/nil body with a Nop' do
+      expect(Puppet::Pops::Model::PNTransformer.transform(nil)).to eq(call('nop'))
+    end
   end
 
   def lit(value)

data/spec/unit/provider/package/pkg_spec.rb

@@ -153,6 +153,14 @@ describe Puppet::Type.type(:package).provider(:pkg), unless: Puppet::Util::Platf
         described_class.expects(:pkg).with(:list,'-Hvn','dummy').returns File.read(my_fixture('dummy_solaris11.installed'))
         provider.latest
       end
+
+      it "applies install options if available" do
+        resource[:install_options] = ['--foo', {'--bar' => 'baz'}]
+        described_class.expects(:pkg).with(:list,'-Hvn','dummy').returns File.read(my_fixture('dummy_solaris11.known'))
+        Puppet::Util::Execution.expects(:execute)
+            .with(['/bin/pkg', 'update', '-n', '--foo', '--bar=baz', 'dummy'], {failonfail: false, combine: true})
+        provider.latest
+      end
     end
 
     context ":instances" do
@@ -251,6 +259,16 @@ describe Puppet::Type.type(:package).provider(:pkg), unless: Puppet::Util::Platf
           before :each do
             Facter.stubs(:value).with(:operatingsystemrelease).returns hash[:osrel]
           end
+
+          it "should support install options" do
+            resource[:install_options] = ['--foo', {'--bar' => 'baz'}]
+            provider.expects(:query).returns({:ensure => :absent})
+            provider.expects(:unhold)
+            Puppet::Util::Execution.expects(:execute)
+              .with(['/bin/pkg', 'install', *hash[:flags], '--foo', '--bar=baz', 'dummy'], {:failonfail => false, :combine => true})
+            provider.install
+          end
+
           it "should accept all licenses" do
             provider.expects(:query).with().returns({:ensure => :absent})
             Puppet::Util::Execution.expects(:execute)

data/spec/unit/provider/package/portage_spec.rb

@@ -23,14 +23,16 @@ describe provider do
     @slotted_resource.stubs(:[]).with(:name).returns(slotted_packagename)
     @slotted_resource.stubs(:[]).with(:install_options).returns(['--foo', { '--bar' => 'baz', '--baz' => 'foo' }])
 
-    versioned_packagename = "dev-lang/ruby-1.9.3"
+    versioned_packagename = "=dev-lang/ruby-1.9.3"
     @versioned_resource = stub('resource', :should => true)
     @versioned_resource.stubs(:[]).with(:name).returns(versioned_packagename)
+    @versioned_resource.stubs(:[]).with(:install_options).returns([])
     @versioned_resource.stubs(:[]).with(:uninstall_options).returns([])
 
     versioned_slotted_packagename = "=dev-lang/ruby-1.9.3:1.9"
     @versioned_slotted_resource = stub('resource', :should => true)
     @versioned_slotted_resource.stubs(:[]).with(:name).returns(versioned_slotted_packagename)
+    @versioned_slotted_resource.stubs(:[]).with(:install_options).returns([])
     @versioned_slotted_resource.stubs(:[]).with(:uninstall_options).returns([])
 
     set_packagename = "@system"
@@ -49,7 +51,7 @@ describe provider do
     @slotted_provider.stubs(:qatom).returns({:category=>"dev-lang", :pn=>"ruby", :pv=>nil, :pr=>nil, :slot=>":2.1", :pfx=>nil, :sfx=>nil})
     @slotted_provider.class.stubs(:emerge).with('--list-sets').returns(package_sets)
     @versioned_provider = provider.new(@versioned_resource)
-    @versioned_provider.stubs(:qatom).returns({:category=>"dev-lang", :pn=>"ruby", :pv=>"1.9.3", :pr=>nil, :slot=>nil, :pfx=>nil, :sfx=>nil})
+    @versioned_provider.stubs(:qatom).returns({:category=>"dev-lang", :pn=>"ruby", :pv=>"1.9.3", :pr=>nil, :slot=>nil, :pfx=>"=", :sfx=>nil})
     @versioned_provider.class.stubs(:emerge).with('--list-sets').returns(package_sets)
     @versioned_slotted_provider = provider.new(@versioned_slotted_resource)
     @versioned_slotted_provider.stubs(:qatom).returns({:category=>"dev-lang", :pn=>"ruby", :pv=>"1.9.3", :pr=>nil, :slot=>":1.9", :pfx=>"=", :sfx=>nil})
@@ -98,6 +100,18 @@ describe provider do
     @provider.uninstall
   end
 
+  it 'should support install of specific version' do
+    @versioned_provider.expects(:emerge).with(@versioned_resource[:name])
+
+    @versioned_provider.install
+  end
+
+  it 'should support install of specific version and slot' do
+    @versioned_slotted_provider.expects(:emerge).with(@versioned_slotted_resource[:name])
+
+    @versioned_slotted_provider.install
+  end
+
   it 'should support uninstall of specific version' do
     @versioned_provider.expects(:emerge).with('--rage-clean', @versioned_resource[:name])
 

data/spec/unit/provider/service/systemd_spec.rb

@@ -33,11 +33,13 @@ describe 'Puppet::Type::Service::Provider::Systemd', unless: Puppet::Util::Platf
     end
   end
 
-  it "should be the default provider on rhel7" do
-    Facter.stubs(:value).with(:osfamily).returns(:redhat)
-    Facter.stubs(:value).with(:operatingsystem).returns(:redhat)
-    Facter.stubs(:value).with(:operatingsystemmajrelease).returns("7")
-    expect(provider_class).to be_default
+  [7, 8].each do |ver|
+    it "should be the default provider on rhel#{ver}" do
+      Facter.stubs(:value).with(:osfamily).returns(:redhat)
+      Facter.stubs(:value).with(:operatingsystem).returns(:redhat)
+      Facter.stubs(:value).with(:operatingsystemmajrelease).returns(ver.to_s)
+      expect(provider_class).to be_default
+    end
   end
 
   [ 4, 5, 6 ].each do |ver|

data/spec/unit/rest/route_spec.rb

@@ -91,7 +91,7 @@ describe Puppet::Rest::Route do
           @srv_records = [record]
 
           @dns_mock.expects(:getresources).
-            with("_x-puppet._tcp.test_service", Resolv::DNS::Resource::IN::SRV).
+            with("_x-puppet-test_service._tcp.example.com", Resolv::DNS::Resource::IN::SRV).
             returns(@srv_records)
         end
 

data/spec/unit/settings_spec.rb

@@ -702,6 +702,42 @@ describe Puppet::Settings do
         @settings.send(:parse_config_files)
       end
     end
+
+    describe "when the file exists" do
+      it "fails if the file is not readable" do
+        Puppet::FileSystem.expects(:exist?).with(user_config_file_default_location).returns(true)
+        @settings.expects(:read_file).raises('Permission denied')
+
+        expect{ @settings.send(:parse_config_files) }.to raise_error(RuntimeError, /Could not load #{user_config_file_default_location}: Permission denied/)
+      end
+
+      it "does not fail if the file is not readable and when `require_config` is false" do
+        Puppet::FileSystem.expects(:exist?).with(user_config_file_default_location).returns(true)
+        @settings.expects(:read_file).raises('Permission denied')
+
+        @settings.expects(:parse_config).never
+        Puppet.expects(:log_exception)
+
+        expect{ @settings.send(:parse_config_files, false) }.not_to raise_error
+      end
+
+      it "reads the file if it is readable" do
+        Puppet::FileSystem.expects(:exist?).with(user_config_file_default_location).returns(true)
+        @settings.expects(:read_file).returns('server = host.string')
+        @settings.expects(:parse_config)
+
+        @settings.send(:parse_config_files)
+      end
+    end
+
+    describe "when the file does not exist" do
+      it "does not attempt to parse the config file" do
+        Puppet::FileSystem.expects(:exist?).with(user_config_file_default_location).returns(false)
+        @settings.expects(:parse_config).never
+
+        @settings.send(:parse_config_files)
+      end
+    end
   end
 
   describe "when parsing its configuration" do

data/spec/unit/transaction_spec.rb

@@ -3,6 +3,7 @@ require 'matchers/include_in_order'
 require 'puppet_spec/compiler'
 
 require 'puppet/transaction'
+require 'puppet/type/notify'
 require 'fileutils'
 
 describe Puppet::Transaction do
@@ -599,6 +600,30 @@ describe Puppet::Transaction do
       transaction.prefetch_if_necessary(resource)
     end
 
+    it "should not rescue SystemExit without future_features flag" do
+      Puppet.settings[:future_features] = false
+      resource.provider.class.expects(:prefetch).raises(SystemExit, "SystemMessage")
+      expect { transaction.prefetch_if_necessary(resource) }.to raise_error(SystemExit, "SystemMessage")
+    end
+
+    it "should not rescue SystemExit with future_features flag" do
+      Puppet.settings[:future_features] = true
+      resource.provider.class.expects(:prefetch).raises(SystemExit, "SystemMessage")
+      expect { transaction.prefetch_if_necessary(resource) }.to raise_error(SystemExit, "SystemMessage")
+    end
+
+    it "should rescue LoadError without future_features flag" do
+      Puppet.settings[:future_features] = false
+      resource.provider.class.expects(:prefetch).raises(LoadError, "LoadMessage")
+      expect { transaction.prefetch_if_necessary(resource) }.not_to raise_error
+    end
+
+    it "should rescue LoadError with future_features flag" do
+      Puppet.settings[:future_features] = true
+      resource.provider.class.expects(:prefetch).raises(LoadError, "LoadMessage")
+      expect { transaction.prefetch_if_necessary(resource) }.not_to raise_error
+    end
+
     describe "and prefetching fails" do
       before :each do
         resource.provider.class.expects(:prefetch).raises(Puppet::Error, "message")
@@ -612,6 +637,11 @@ describe Puppet::Transaction do
         it "should not rescue prefetch executions" do
           expect { transaction.prefetch_if_necessary(resource) }.to raise_error(Puppet::Error)
         end
+
+        it "should log the exception during prefetch" do
+          Puppet.expects(:log_exception).with(anything, "Could not prefetch package provider 'pkgng': message")
+          expect { transaction.prefetch_if_necessary(resource) }.to raise_error(Puppet::Error, "message")
+        end
       end
 
       context "with future_features flag" do
@@ -896,6 +926,30 @@ describe Puppet::Transaction do
       expect(transaction.report.resource_statuses['Notify[b]']).to be_skipped
     end
   end
+
+  describe "failed dependency is depended on multiple times" do
+    it "notifies the failed dependency once" do
+      command_string = File.expand_path('/my/command')
+      Puppet::Util::Execution.stubs(:execute).with([command_string]).raises(Puppet::ExecutionFailure, "Failed")
+
+      Puppet::Type::Notify.any_instance.expects(:send_log).with(:notice, "Dependency Exec[exec1] has failures: true")
+      Puppet::Type::Notify.any_instance.expects(:send_log).with(:notice, "Dependency Exec[exec2] has failures: true")
+      Puppet::Type::Notify.any_instance.expects(:send_log).with(:notice, "Dependency Exec[exec3] has failures: true")
+      Puppet::Type::Notify.any_instance.expects(:send_log).with(:notice, "Dependency Exec[exec4] has failures: true")
+      Puppet::Type::Notify.any_instance.expects(:send_log).with(:notice, "Dependency Exec[exec5] has failures: true")
+
+      Puppet::Type::Notify.any_instance.expects(:send_log).with(:warning, "Skipping because of failed dependencies").times(3)
+
+      apply_compiled_manifest(<<-MANIFEST)
+        exec { ['exec1', 'exec2', 'exec3', 'exec4', 'exec5']:
+          command => '#{command_string}'
+        } ->
+        notify { ['notify1', 'notify2', 'notify3']: }
+      MANIFEST
+
+    end
+  end
+
 end
 
 describe Puppet::Transaction, " when determining tags" do

data/spec/unit/util/command_line_spec.rb

@@ -67,8 +67,8 @@ describe Puppet::Util::CommandLine do
       end
     end
 
-    %w{--help -h}.each do|arg|
-      it "should print help" do
+    %w{--help -h help}.each do|arg|
+      it "should print help and exit if #{arg} is given" do
         commandline = Puppet::Util::CommandLine.new("puppet", [arg])
         commandline.expects(:exec).never
 
@@ -77,6 +77,27 @@ describe Puppet::Util::CommandLine do
         }.to have_printed(/Usage: puppet <subcommand> \[options\] <action> \[options\]/).and_exit_with(0)
       end
     end
+
+    it "should fail if the config file isn't readable and we're running a subcommand that requires a readable config file" do
+      Puppet::FileSystem.stubs(:exist?).with(Puppet[:config]).returns(true)
+      Puppet::Settings.any_instance.stubs(:read_file).returns('')
+      Puppet::Settings.any_instance.expects(:read_file).with(Puppet[:config]).raises('Permission denied')
+
+      expect{ described_class.new("puppet", ['config']).execute }.to raise_error(SystemExit)
+    end
+
+    it "should not fail if the config file isn't readable and we're running a subcommand that does not require a readable config file" do
+      Puppet::FileSystem.stubs(:exist?)
+      Puppet::FileSystem.stubs(:exist?).with(Puppet[:config]).returns(true)
+      Puppet::Settings.any_instance.stubs(:read_file).returns('')
+      Puppet::Settings.any_instance.expects(:read_file).with(Puppet[:config]).raises('Permission denied')
+
+      commandline = described_class.new("puppet", ['help'])
+
+      expect {
+        commandline.execute
+      }.to have_printed(/Usage: puppet <subcommand> \[options\] <action> \[options\]/).and_exit_with(0)
+    end
   end
 
   describe "when dealing with puppet commands" do

data/spec/unit/util/log/destinations_spec.rb

@@ -92,6 +92,24 @@ describe Puppet::Util::Log.desttypes[:file] do
           expect(JSON.parse(File.read(abspath) + ']')).to include(a_hash_including({"message" => "don't panic"}))
         end
       end
+
+      describe "with a JSON lines file" do
+        let (:abspath) { '/tmp/log.jsonl' }
+        let (:relpath) { 'log.jsonl' }
+
+        it_behaves_like "file destination"
+
+        it "should log messages as JSON lines" do
+          msg1 = Puppet::Util::Log.new(:level => :info, :message => "don't panic")
+          msg2 = Puppet::Util::Log.new(:level => :err, :message => "panic!")
+          dest = @class.new(abspath)
+          dest.handle(msg1)
+          dest.handle(msg2)
+          lines = IO.readlines(abspath)
+          expect(JSON.parse(lines[-2])).to include("level" => "info", "message" => "don't panic")
+          expect(JSON.parse(lines[-1])).to include("level" => "err", "message" => "panic!")
+        end
+      end
     end
 
     describe "on Windows systems", :if => Puppet::Util::Platform.windows? do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.2.0
 platform: x86-mingw32
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-17 00:00:00.000000000 Z
+date: 2019-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -1637,8 +1637,13 @@ files:
 - spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/types/withuseeone.pp
 - spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/types/withuseezero.pp
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/bad_func_load.rb
+- spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/bad_func_load2.rb
+- spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/bad_func_load3.rb
+- spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/bad_func_load4.rb
+- spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/bad_func_load5.rb
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/callee.rb
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/callee_ws.rb
+- spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/good_func_load.rb
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/metadata.json
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/user/functions/puppetcalled.pp
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/user/functions/puppetcaller.pp
@@ -2835,8 +2840,13 @@ test_files:
 - spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/types/withuseeone.pp
 - spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/types/withuseezero.pp
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/bad_func_load.rb
+- spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/bad_func_load2.rb
+- spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/bad_func_load3.rb
+- spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/bad_func_load4.rb
+- spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/bad_func_load5.rb
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/callee.rb
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/callee_ws.rb
+- spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/good_func_load.rb
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/metadata.json
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/user/functions/puppetcalled.pp
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/user/functions/puppetcaller.pp