puppet 5.5.8-x86-mingw32 → 5.5.10-x86-mingw32

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

@@ -1,14 +1,6 @@
-#! /usr/bin/env ruby
-#
-# Unit testing for the AIX System Resource Controller (src) provider
-#
-
 require 'spec_helper'
 
-provider_class = Puppet::Type.type(:service).provider(:src)
-
-describe provider_class do
-
+describe Puppet::Type.type(:service).provider(:src) do
   if Puppet.features.microsoft_windows?
     # Get a pid for $CHILD_STATUS to latch on to
     command = "cmd.exe /c \"exit 0\""
@@ -20,7 +12,7 @@ describe provider_class do
     @resource.stubs(:[]).returns(nil)
     @resource.stubs(:[]).with(:name).returns "myservice"
 
-    @provider = provider_class.new
+    @provider = subject()
     @provider.resource = @resource
 
     @provider.stubs(:command).with(:stopsrc).returns "/usr/bin/stopsrc"
@@ -42,9 +34,9 @@ describe provider_class do
     @provider.stubs(:chitab)
   end
 
-  describe ".instances" do
+  context ".instances" do
     it "should have a .instances method" do
-      expect(provider_class).to respond_to :instances
+      expect(described_class).to respond_to :instances
     end
 
     it "should get a list of running services" do
@@ -55,8 +47,8 @@ myservice.2:::/usr/sbin/inetd:0:0:/dev/console:/dev/console:/dev/console:-O:-Q:-
 myservice.3:::/usr/sbin/inetd:0:0:/dev/console:/dev/console:/dev/console:-O:-Q:-K:0:0:20:0:0:-d:20:tcpip:
 myservice.4:::/usr/sbin/inetd:0:0:/dev/console:/dev/console:/dev/console:-O:-Q:-K:0:0:20:0:0:-d:20:tcpip:
 _EOF_
-      provider_class.stubs(:lssrc).returns sample_output
-      expect(provider_class.instances.map(&:name)).to eq([
+      described_class.stubs(:lssrc).returns sample_output
+      expect(described_class.instances.map(&:name)).to eq([
         'myservice.1',
         'myservice.2',
         'myservice.3',
@@ -66,7 +58,7 @@ _EOF_
 
   end
 
-  describe "when starting a service" do
+  context "when starting a service" do
     it "should execute the startsrc command" do
       @provider.expects(:execute).with(['/usr/bin/startsrc', '-s', "myservice"], {:override_locale => false, :squelch => false, :combine => true, :failonfail => true})
       @provider.expects(:status).returns :running
@@ -80,7 +72,7 @@ _EOF_
     end
   end
 
-  describe "when stopping a service" do
+  context "when stopping a service" do
     it "should execute the stopsrc command" do
       @provider.expects(:execute).with(['/usr/bin/stopsrc', '-s', "myservice"], {:override_locale => false, :squelch => false, :combine => true, :failonfail => true})
       @provider.expects(:status).returns :stopped
@@ -94,7 +86,7 @@ _EOF_
     end
   end
 
-  describe "should have a set of methods" do
+  context "should have a set of methods" do
     [:enabled?, :enable, :disable, :start, :stop, :status, :restart].each do |method|
       it "should have a #{method} method" do
         expect(@provider).to respond_to(method)
@@ -102,21 +94,21 @@ _EOF_
     end
   end
 
-  describe "when enabling" do
+  context "when enabling" do
     it "should execute the mkitab command" do
       @provider.expects(:mkitab).with("myservice:2:once:/usr/bin/startsrc -s myservice").once
       @provider.enable
     end
   end
 
-  describe "when disabling" do
+  context "when disabling" do
     it "should execute the rmitab command" do
       @provider.expects(:rmitab).with("myservice")
       @provider.disable
     end
   end
 
-  describe "when checking if it is enabled" do
+  context "when checking if it is enabled" do
     it "should execute the lsitab command" do
       @provider.expects(:execute).with(['/usr/sbin/lsitab', 'myservice'], {:combine => true, :failonfail => false})
       $CHILD_STATUS.stubs(:exitstatus).returns(0)
@@ -136,8 +128,7 @@ _EOF_
     end
   end
 
-
-  describe "when checking a subsystem's status" do
+  context "when checking a subsystem's status" do
     it "should execute status and return running if the subsystem is active" do
       sample_output = <<_EOF_
   Subsystem         Group            PID          Status
@@ -174,7 +165,7 @@ _EOF_
     end
   end
 
-  describe "when restarting a service" do
+  context "when restarting a service" do
     it "should execute restart which runs refresh" do
       sample_output = <<_EOF_
 #subsysname:synonym:cmdargs:path:uid:auditid:standin:standout:standerr:action:multi:contact:svrkey:svrmtype:priority:signorm:sigforce:display:waittime:grpname:

data/spec/unit/provider/user/hpux_spec.rb

@@ -1,10 +1,7 @@
-#!/usr/bin/env ruby
 require 'spec_helper'
 require 'etc'
 
-provider_class = Puppet::Type.type(:user).provider(:hpuxuseradd)
-
-describe provider_class, :unless => Puppet.features.microsoft_windows? do
+describe Puppet::Type.type(:user).provider(:hpuxuseradd), :unless => Puppet.features.microsoft_windows? do
   let :resource do
     Puppet::Type.type(:user).new(
       :title => 'testuser',
@@ -38,7 +35,7 @@ describe provider_class, :unless => Puppet.features.microsoft_windows? do
     end
 
     it "should have feature manages_passwords" do
-      expect(provider_class).to be_manages_passwords
+      expect(described_class).to be_manages_passwords
     end
 
     it "should return nil if user does not exist" do

data/spec/unit/provider/user/ldap_spec.rb

@@ -1,27 +1,24 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
-provider_class = Puppet::Type.type(:user).provider(:ldap)
-
-describe provider_class do
+describe Puppet::Type.type(:user).provider(:ldap) do
   it "should have the Ldap provider class as its baseclass" do
-    expect(provider_class.superclass).to equal(Puppet::Provider::Ldap)
+    expect(described_class.superclass).to equal(Puppet::Provider::Ldap)
   end
 
   it "should manage :posixAccount and :person objectclasses" do
-    expect(provider_class.manager.objectclasses).to eq([:posixAccount, :person])
+    expect(described_class.manager.objectclasses).to eq([:posixAccount, :person])
   end
 
   it "should use 'ou=People' as its relative base" do
-    expect(provider_class.manager.location).to eq("ou=People")
+    expect(described_class.manager.location).to eq("ou=People")
   end
 
   it "should use :uid as its rdn" do
-    expect(provider_class.manager.rdn).to eq(:uid)
+    expect(described_class.manager.rdn).to eq(:uid)
   end
 
   it "should be able to manage passwords" do
-    expect(provider_class).to be_manages_passwords
+    expect(described_class).to be_manages_passwords
   end
 
   {:name => "uid",
@@ -33,15 +30,15 @@ describe provider_class do
     :shell => "loginShell"
   }.each do |puppet, ldap|
     it "should map :#{puppet.to_s} to '#{ldap}'" do
-      expect(provider_class.manager.ldap_name(puppet)).to eq(ldap)
+      expect(described_class.manager.ldap_name(puppet)).to eq(ldap)
     end
   end
 
-  describe "when being created" do
+  context "when being created" do
     before do
       # So we don't try to actually talk to ldap
       @connection = mock 'connection'
-      provider_class.manager.stubs(:connect).yields @connection
+      described_class.manager.stubs(:connect).yields @connection
     end
 
     it "should generate the sn as the last field of the cn" do
@@ -50,7 +47,7 @@ describe provider_class do
       resource = stub 'resource', :should => %w{whatever}
       resource.stubs(:should).with(:comment).returns ["Luke Kanies"]
       resource.stubs(:should).with(:ensure).returns :present
-      instance = provider_class.new(:name => "luke", :ensure => :absent)
+      instance = described_class.new(:name => "luke", :ensure => :absent)
 
       instance.stubs(:resource).returns resource
 
@@ -66,7 +63,7 @@ describe provider_class do
       resource = stub 'resource', :should => %w{whatever}
       resource.stubs(:should).with(:gid).returns 'bar'
       resource.stubs(:should).with(:ensure).returns :present
-      instance = provider_class.new(:name => "luke", :ensure => :absent)
+      instance = described_class.new(:name => "luke", :ensure => :absent)
       instance.stubs(:resource).returns resource
 
       @connection.expects(:add).with { |dn, attrs| attrs["gidNumber"] == ["101"] }
@@ -75,18 +72,18 @@ describe provider_class do
       instance.flush
     end
 
-    describe "with no uid specified" do
+    context "with no uid specified" do
       it "should pick the first available UID after the largest existing UID" do
         Puppet::Type.type(:group).provider(:ldap).expects(:name2id).with(["whatever"]).returns [123]
 
         low = {:name=>["luke"], :shell=>:absent, :uid=>["600"], :home=>["/h"], :gid=>["1000"], :password=>["blah"], :comment=>["l k"]}
         high = {:name=>["testing"], :shell=>:absent, :uid=>["640"], :home=>["/h"], :gid=>["1000"], :password=>["blah"], :comment=>["t u"]}
-        provider_class.manager.expects(:search).returns([low, high])
+        described_class.manager.expects(:search).returns([low, high])
 
         resource = stub 'resource', :should => %w{whatever}
         resource.stubs(:should).with(:uid).returns nil
         resource.stubs(:should).with(:ensure).returns :present
-        instance = provider_class.new(:name => "luke", :ensure => :absent)
+        instance = described_class.new(:name => "luke", :ensure => :absent)
         instance.stubs(:resource).returns resource
 
         @connection.expects(:add).with { |dn, attrs| attrs["uidNumber"] == ["641"] }
@@ -98,12 +95,12 @@ describe provider_class do
       it "should pick 501 of no users exist" do
         Puppet::Type.type(:group).provider(:ldap).expects(:name2id).with(["whatever"]).returns [123]
 
-        provider_class.manager.expects(:search).returns nil
+        described_class.manager.expects(:search).returns nil
 
         resource = stub 'resource', :should => %w{whatever}
         resource.stubs(:should).with(:uid).returns nil
         resource.stubs(:should).with(:ensure).returns :present
-        instance = provider_class.new(:name => "luke", :ensure => :absent)
+        instance = described_class.new(:name => "luke", :ensure => :absent)
         instance.stubs(:resource).returns resource
 
         @connection.expects(:add).with { |dn, attrs| attrs["uidNumber"] == ["501"] }
@@ -114,11 +111,11 @@ describe provider_class do
     end
   end
 
-  describe "when flushing" do
+  context "when flushing" do
     before do
-      provider_class.stubs(:suitable?).returns true
+      described_class.stubs(:suitable?).returns true
 
-      @instance = provider_class.new(:name => "myname", :groups => %w{whatever}, :uid => "400")
+      @instance = described_class.new(:name => "myname", :groups => %w{whatever}, :uid => "400")
     end
 
     it "should remove the :groups value before updating" do
@@ -144,13 +141,13 @@ describe provider_class do
     end
   end
 
-  describe "when checking group membership" do
+  context "when checking group membership" do
     before do
       @groups = Puppet::Type.type(:group).provider(:ldap)
       @group_manager = @groups.manager
-      provider_class.stubs(:suitable?).returns true
+      described_class.stubs(:suitable?).returns true
 
-      @instance = provider_class.new(:name => "myname")
+      @instance = described_class.new(:name => "myname")
     end
 
     it "should show its group membership as the sorted list of all groups returned by an ldap query of group memberships" do
@@ -175,11 +172,11 @@ describe provider_class do
     end
   end
 
-  describe "when modifying group membership" do
+  context "when modifying group membership" do
     before do
       @groups = Puppet::Type.type(:group).provider(:ldap)
       @group_manager = @groups.manager
-      provider_class.stubs(:suitable?).returns true
+      described_class.stubs(:suitable?).returns true
 
       @one = {:name => "one", :gid => "500"}
       @group_manager.stubs(:find).with("one").returns(@one)
@@ -187,7 +184,7 @@ describe provider_class do
       @two = {:name => "one", :gid => "600"}
       @group_manager.stubs(:find).with("two").returns(@two)
 
-      @instance = provider_class.new(:name => "myname")
+      @instance = described_class.new(:name => "myname")
 
       @instance.stubs(:groups).returns :absent
     end
@@ -231,7 +228,7 @@ describe provider_class do
       @instance.groups = "one"
     end
 
-    describe "for groups that have no members" do
+    context "for groups that have no members" do
       it "should create a new members attribute with its value being the user's name" do
         @group_manager.expects(:update).with { |name, is, should| should[:members] == %w{myname} }
 
@@ -239,7 +236,7 @@ describe provider_class do
       end
     end
 
-    describe "for groups it is being removed from" do
+    context "for groups it is being removed from" do
       it "should replace the group's member list with one missing the user's name" do
         @one[:members] = %w{myname a}
         @two[:members] = %w{myname b}
@@ -261,7 +258,7 @@ describe provider_class do
       end
     end
 
-    describe "for groups that already have members" do
+    context "for groups that already have members" do
       it "should replace each group's member list with a new list including the user's name" do
         @one[:members] = %w{a b}
         @group_manager.expects(:update).with { |name, is, should| should[:members] == %w{a b myname} }
@@ -272,7 +269,7 @@ describe provider_class do
       end
     end
 
-    describe "for groups of which it is a member" do
+    context "for groups of which it is a member" do
       it "should do nothing" do
         @one[:members] = %w{a b}
         @group_manager.expects(:update).with { |name, is, should| should[:members] == %w{a b myname} }

data/spec/unit/provider/user/pw_spec.rb

@@ -1,14 +1,11 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
-provider_class = Puppet::Type.type(:user).provider(:pw)
-
-describe provider_class do
+describe Puppet::Type.type(:user).provider(:pw) do
   let :resource do
     Puppet::Type.type(:user).new(:name => "testuser", :provider => :pw)
   end
 
-  describe "when creating users" do
+  context "when creating users" do
     let :provider do
       prov = resource.provider
       prov.expects(:exists?).returns nil
@@ -16,8 +13,8 @@ describe provider_class do
     end
 
     it "should run pw with no additional flags when no properties are given" do
-      expect(provider.addcmd).to eq([provider_class.command(:pw), "useradd", "testuser"])
-      provider.expects(:execute).with([provider_class.command(:pw), "useradd", "testuser"], kind_of(Hash))
+      expect(provider.addcmd).to eq([described_class.command(:pw), "useradd", "testuser"])
+      provider.expects(:execute).with([described_class.command(:pw), "useradd", "testuser"], kind_of(Hash))
       provider.create
     end
 
@@ -104,12 +101,12 @@ describe provider_class do
     end
   end
 
-  describe "when deleting users" do
+  context "when deleting users" do
     it "should run pw with no additional flags" do
       provider = resource.provider
       provider.expects(:exists?).returns true
-      expect(provider.deletecmd).to eq([provider_class.command(:pw), "userdel", "testuser"])
-      provider.expects(:execute).with([provider_class.command(:pw), "userdel", "testuser"], has_entry(:custom_environment, {}))
+      expect(provider.deletecmd).to eq([described_class.command(:pw), "userdel", "testuser"])
+      provider.expects(:execute).with([described_class.command(:pw), "userdel", "testuser"], has_entry(:custom_environment, {}))
       provider.delete
     end
 
@@ -133,14 +130,14 @@ describe provider_class do
     end
   end
 
-  describe "when modifying users" do
+  context "when modifying users" do
     let :provider do
       resource.provider
     end
 
     it "should run pw with the correct arguments" do
-      expect(provider.modifycmd("uid", 12345)).to eq([provider_class.command(:pw), "usermod", "testuser", "-u", 12345])
-      provider.expects(:execute).with([provider_class.command(:pw), "usermod", "testuser", "-u", 12345], has_entry(:custom_environment, {}))
+      expect(provider.modifycmd("uid", 12345)).to eq([described_class.command(:pw), "usermod", "testuser", "-u", 12345])
+      provider.expects(:execute).with([described_class.command(:pw), "usermod", "testuser", "-u", 12345], has_entry(:custom_environment, {}))
       provider.uid = 12345
     end
 

data/spec/unit/ssl/key_spec.rb

@@ -129,8 +129,8 @@ describe Puppet::SSL::Key do
     end
 
     it "should create the private key with the keylength specified in the settings" do
-      Puppet[:keylength] = "50"
-      OpenSSL::PKey::RSA.expects(:new).with(50).returns(@key)
+      Puppet[:keylength] = 513
+      OpenSSL::PKey::RSA.expects(:new).with(513).returns(@key)
 
       @instance.generate
     end
@@ -172,8 +172,6 @@ describe Puppet::SSL::Key do
       end
 
       it "should export the private key to text using the password" do
-        Puppet[:keylength] = "50"
-
         @instance.password_file = "/path/to/pass"
         @instance.stubs(:password).returns "my password"
 

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