puppet 6.0.4-x86-mingw32 → 6.0.5-x86-mingw32

data/spec/unit/transaction/event_manager_spec.rb

@@ -174,11 +174,22 @@ describe Puppet::Transaction::EventManager do
       expect(@transaction.resource_status(@resource)).to be_restarted
     end
 
+    it "should have an event on the resource status" do
+      @manager.expects(:queued_events).with(@resource).yields(:callback1, [@event])
+
+      @resource.stubs(:callback1)
+
+      @manager.process_events(@resource) #x
+
+      expect(@transaction.resource_status(@resource).events.length).to eq(1)
+    end
+
     it "should queue a 'restarted' event generated by the resource" do
       @manager.expects(:queued_events).with(@resource).yields(:callback1, [@event])
 
       @resource.stubs(:callback1)
 
+      @resource.expects(:event).with(:message => "Triggered 'callback1' from 1 event", :status => 'success', :name => 'callback1')
       @resource.expects(:event).with(:name => :restarted, :status => "success").returns "myevent"
       @manager.expects(:queue_events).with(@resource, ["myevent"])
 
@@ -295,7 +306,7 @@ describe Puppet::Transaction::EventManager do
       it "should record a failed event on the resource status" do
         @manager.process_events(@resource)
 
-        expect(@transaction.resource_status(@resource).events.length).to eq(1)
+        expect(@transaction.resource_status(@resource).events.length).to eq(2)
         expect(@transaction.resource_status(@resource).events[0].status).to eq('failure')
       end
 

data/spec/unit/transaction/resource_harness_spec.rb

@@ -173,6 +173,10 @@ describe Puppet::Transaction::ResourceHarness do
           def insync?(value)
             @resource.behaviors[:ensure_insync?]
           end
+
+          def should_to_s(value)
+            (@resource.behaviors[:on_should_to_s] || proc { "'#{value}'" }).call
+          end
         end
 
         newparam(:name) do
@@ -266,6 +270,20 @@ describe Puppet::Transaction::ResourceHarness do
 
       expect(status.events).to be_empty
     end
+
+    it "ensure errors in message still get a log entry" do
+      resource = an_ensurable_resource_reacting_as(:ensure_insync? => false, :on_ensure => proc { raise StandardError }, :on_should_to_s => proc { raise StandardError }, :present? => true)
+
+      status = @harness.evaluate(resource)
+
+      expect(status.events.length).to eq(2)
+      testing_errors = status.events.find_all { |x| x.name.to_s == "Testing_created" }
+      resource_errors = status.events.find_all { |x| x.name.to_s == "resource_error" }
+      expect(testing_errors.length).to eq(1)
+      expect(resource_errors.length).to eq(1)
+      expect(testing_errors[0].message).not_to be_nil
+      expect(resource_errors[0].message).not_to eq("Puppet::Util::Log requires a message")
+    end
   end
 
   describe "when a caught error occurs" 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
@@ -896,6 +897,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/filetype_spec.rb

@@ -107,6 +107,10 @@ describe Puppet::Util::FileType do
     end
 
     describe "#read" do
+      before(:each) do
+        Puppet::Util.stubs(:uid).with(uid).returns 9000
+      end
+
       it "should run crontab -l as the target user" do
         Puppet::Util::Execution.expects(:execute)
           .with(['crontab', '-l'], user_options)
@@ -115,7 +119,7 @@ describe Puppet::Util::FileType do
       end
 
       it "should not switch user if current user is the target user" do
-        Puppet::Util.expects(:uid).with(uid).returns 9000
+        Puppet::Util.expects(:uid).with(uid).twice.returns 9000
         Puppet::Util::SUIDManager.expects(:uid).returns 9000
         Puppet::Util::Execution
           .expects(:execute).with(['crontab', '-l'], options)
@@ -128,11 +132,15 @@ describe Puppet::Util::FileType do
         expect(cron.read).to eq('')
       end
 
-      it "should raise an error if the user is not authorized to use cron" do
+      it "should treat a nonexistent user's crontab as empty" do
+        Puppet::Util.expects(:uid).with(uid).returns nil
+
+        expect(cron.read).to eq('')
+      end
+
+      it "should return empty if the user is not authorized to use cron" do
         Puppet::Util::Execution.expects(:execute).with(['crontab', '-l'], user_options).raises(Puppet::ExecutionFailure, unauthorized_crontab)
-        expect {
-          cron.read
-        }.to raise_error Puppet::Error, /User #{uid} not authorized to use cron/
+        expect(cron.read).to eq('')
       end
     end
 

data/spec/unit/util/logging_spec.rb

@@ -360,21 +360,6 @@ original
       Facter.unstub(:debugging)
     end
 
-    describe 'does not support debugging' do
-      before :each do
-        Facter.stubs(:respond_to?).with(:debugging).returns false
-        Facter.stubs(:debugging).never
-      end
-
-      it 'does not enable Facter debugging for debug level' do
-        Puppet::Util::Log.level = :debug
-      end
-
-      it 'does not enable Facter debugging non-debug level' do
-        Puppet::Util::Log.level = :info
-      end
-    end
-
     describe 'does support debugging' do
       before :each do
         Facter.stubs(:respond_to?).with(:debugging).returns true
@@ -391,21 +376,6 @@ original
       end
     end
 
-    describe 'does not support trace' do
-      before :each do
-        Facter.stubs(:respond_to?).with(:trace).returns false
-        Facter.stubs(:trace).never
-      end
-
-      it 'does not enable Facter trace when enabled' do
-        Puppet[:trace] = true
-      end
-
-      it 'does not enable Facter trace when disabled' do
-        Puppet[:trace] = false
-      end
-    end
-
     describe 'does support trace' do
       before :each do
         Facter.stubs(:respond_to?).with(:trace).returns true
@@ -422,17 +392,6 @@ original
       end
     end
 
-    describe 'does not support on_message' do
-      before :each do
-        Facter.stubs(:respond_to?).with(:on_message).returns false
-        Facter.stubs(:on_message).never
-      end
-
-      it 'does not call Facter.on_message' do
-        expect(Puppet::Util::Logging::setup_facter_logging!).to be_falsey
-      end
-    end
-
     describe 'does support on_message' do
       before :each do
         Facter.stubs(:respond_to?).with(:on_message).returns true

data/spec/unit/util/monkey_patches_spec.rb

@@ -101,13 +101,26 @@ describe OpenSSL::X509::Store, :if => Puppet::Util::Platform.windows? do
     store.set_default_paths
   end
 
-  it "warns when adding a certificate that already exists" do
-    with_root_certs([cert])
-    store.add_cert(cert)
+  # openssl 1.1.1 ignores duplicate certs
+  # https://github.com/openssl/openssl/commit/c0452248ea1a59a41023a4765ef7d9825e80a62b
+  if OpenSSL::OPENSSL_VERSION_NUMBER < 0x10101000
+    it "warns when adding a certificate that already exists" do
+      with_root_certs([cert])
+      store.add_cert(cert)
 
-    store.expects(:warn).with('Failed to add /DC=com/DC=microsoft/CN=Microsoft Root Certificate Authority')
+      store.expects(:warn).with('Failed to add /DC=com/DC=microsoft/CN=Microsoft Root Certificate Authority')
 
-    store.set_default_paths
+      store.set_default_paths
+    end
+  else
+    it "doesn't warn when adding a duplicate cert" do
+      with_root_certs([cert])
+      store.add_cert(cert)
+
+      store.expects(:warn).never
+
+      store.set_default_paths
+    end
   end
 
   it "raises when adding an invalid certificate" do

data/spec/unit/util/selinux_spec.rb

@@ -73,6 +73,10 @@ describe Puppet::Util::SELinux do
       expect(selinux_label_support?('/etc/puppetlabs/puppet/testfile')).to be_truthy
     end
 
+    it "should return true if tmpfs" do
+      expect(selinux_label_support?('/dev/shm/testfile')).to be_truthy
+    end
+
     it "should return false for a noncapable filesystem" do
       expect(selinux_label_support?('/mnt/nfs/testfile')).to be_falsey
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 6.0.4
+  version: 6.0.5
 platform: x86-mingw32
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-31 00:00:00.000000000 Z
+date: 2019-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -1736,6 +1736,8 @@ files:
 - spec/fixtures/unit/provider/service/openrc/rcservice_list
 - spec/fixtures/unit/provider/service/openrc/rcstatus
 - spec/fixtures/unit/provider/service/smf/svcs.out
+- spec/fixtures/unit/provider/service/smf/svcs_fmri.out
+- spec/fixtures/unit/provider/service/smf/svcs_multiple_fmris.out
 - spec/fixtures/unit/provider/service/systemd/list_unit_files_services
 - spec/fixtures/unit/provider/user/aix/aix_passwd_file.out
 - spec/fixtures/unit/reports/tagmail/tagmail_email.conf
@@ -1819,6 +1821,7 @@ files:
 - spec/integration/ssl/key_spec.rb
 - spec/integration/test/test_helper_spec.rb
 - spec/integration/transaction/report_spec.rb
+- spec/integration/transaction_spec.rb
 - spec/integration/type/exec_spec.rb
 - spec/integration/type/file_spec.rb
 - spec/integration/type/package_spec.rb
@@ -2933,6 +2936,8 @@ test_files:
 - spec/fixtures/unit/provider/service/openrc/rcservice_list
 - spec/fixtures/unit/provider/service/openrc/rcstatus
 - spec/fixtures/unit/provider/service/smf/svcs.out
+- spec/fixtures/unit/provider/service/smf/svcs_fmri.out
+- spec/fixtures/unit/provider/service/smf/svcs_multiple_fmris.out
 - spec/fixtures/unit/provider/service/systemd/list_unit_files_services
 - spec/fixtures/unit/provider/user/aix/aix_passwd_file.out
 - spec/fixtures/unit/reports/tagmail/tagmail_email.conf
@@ -3016,6 +3021,7 @@ test_files:
 - spec/integration/ssl/key_spec.rb
 - spec/integration/test/test_helper_spec.rb
 - spec/integration/transaction/report_spec.rb
+- spec/integration/transaction_spec.rb
 - spec/integration/type/exec_spec.rb
 - spec/integration/type/file_spec.rb
 - spec/integration/type/package_spec.rb