puppet 4.5.3-x64-mingw32 → 4.6.1-x64-mingw32

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

@@ -17,6 +17,12 @@ describe "base service provider" do
 
   subject { provider }
 
+  if Puppet.features.microsoft_windows?
+    # Get a pid for $CHILD_STATUS to latch on to
+    command = "cmd.exe /c \"exit 0\""
+    Puppet::Util::Execution.execute(command, {:failonfail => false})
+  end
+
   context "basic operations" do
     subject do
       type.new(

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

@@ -9,6 +9,12 @@ provider_class = Puppet::Type.type(:service).provider(:debian)
 
 describe provider_class do
 
+  if Puppet.features.microsoft_windows?
+    # Get a pid for $CHILD_STATUS to latch on to
+    command = "cmd.exe /c \"exit 0\""
+    Puppet::Util::Execution.execute(command, {:failonfail => false})
+  end
+
   before(:each) do
     # Create a mock resource
     @resource = stub 'resource'
@@ -33,17 +39,20 @@ describe provider_class do
     @provider.stubs(:invoke_rc)
   end
 
-  operatingsystem = [ 'Debian', 'CumulusLinux' ]
-  operatingsystem.each do |os|
-    it "should be the default provider on #{os}" do
-      Facter.expects(:value).with(:operatingsystem).at_least_once.returns(os)
-      if os == 'Debian'
-        Facter.expects(:value).with(:operatingsystemmajrelease).returns('7')
-      end
+  ['1','2'].each do |version|
+    it "should be the default provider on CumulusLinux #{version}" do
+      Facter.expects(:value).with(:operatingsystem).at_least_once.returns('CumulusLinux')
+      Facter.expects(:value).with(:operatingsystemmajrelease).returns(version)
       expect(provider_class.default?).to be_truthy
     end
   end
 
+  it "should be the default provider on Debian" do
+    Facter.expects(:value).with(:operatingsystem).at_least_once.returns('Debian')
+    Facter.expects(:value).with(:operatingsystemmajrelease).returns('7')
+    expect(provider_class.default?).to be_truthy
+  end
+
   it "should have an enabled? method" do
     expect(@provider).to respond_to(:enabled?)
   end

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

@@ -4,6 +4,12 @@ require 'spec_helper'
 
 describe Puppet::Type.type(:service).provider(:gentoo) do
 
+  if Puppet.features.microsoft_windows?
+    # Get a pid for $CHILD_STATUS to latch on to
+    command = "cmd.exe /c \"exit 0\""
+    Puppet::Util::Execution.execute(command, {:failonfail => false})
+  end
+
   before :each do
     Puppet::Type.type(:service).stubs(:defaultprovider).returns described_class
     FileTest.stubs(:file?).with('/sbin/rc-update').returns true

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

@@ -6,6 +6,13 @@
 require 'spec_helper'
 
 describe Puppet::Type.type(:service).provider(:init) do
+
+  if Puppet.features.microsoft_windows?
+    # Get a pid for $CHILD_STATUS to latch on to
+    command = "cmd.exe /c \"exit 0\""
+    Puppet::Util::Execution.execute(command, {:failonfail => false})
+  end
+
   before do
     Puppet::Type.type(:service).defaultprovider = described_class
   end

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

@@ -7,11 +7,17 @@ describe Puppet::Type.type(:service).provider(:launchd) do
   let (:plistlib) { Puppet::Util::Plist }
   let (:joblabel) { "com.foo.food" }
   let (:provider) { subject.class }
-  let(:resource) { Puppet::Type.type(:service).new(:name => joblabel, :provider => :launchd) }
+  let (:resource) { Puppet::Type.type(:service).new(:name => joblabel, :provider => :launchd) }
   let (:launchd_overrides_6_9) { '/var/db/launchd.db/com.apple.launchd/overrides.plist' }
   let (:launchd_overrides_10_) { '/var/db/com.apple.xpc.launchd/disabled.plist' }
   subject { resource.provider }
 
+  if Puppet.features.microsoft_windows?
+    # Get a pid for $CHILD_STATUS to latch on to
+    command = "cmd.exe /c \"exit 0\""
+    Puppet::Util::Execution.execute(command, {:failonfail => false})
+  end
+
   describe "the type interface" do
     %w{ start stop enabled? enable disable status}.each do |method|
       it { is_expected.to respond_to method.to_sym }
@@ -20,9 +26,9 @@ describe Puppet::Type.type(:service).provider(:launchd) do
 
   describe 'the status of the services' do
     it "should call the external command 'launchctl list' once" do
-     provider.expects(:launchctl).with(:list).returns(joblabel)
-     provider.expects(:jobsearch).with(nil).returns({joblabel => "/Library/LaunchDaemons/#{joblabel}"})
-     provider.prefetch({})
+      provider.expects(:launchctl).with(:list).returns(joblabel)
+      provider.expects(:jobsearch).with(nil).returns({joblabel => "/Library/LaunchDaemons/#{joblabel}"})
+      provider.prefetch({})
     end
     it "should return stopped if not listed in launchctl list output" do
       provider.expects(:launchctl).with(:list).returns('com.bar.is_running')
@@ -37,6 +43,31 @@ describe Puppet::Type.type(:service).provider(:launchd) do
     after :each do
       provider.instance_variable_set(:@job_list, nil)
     end
+
+    describe "when hasstatus is set to false" do
+      before :each do
+        resource[:hasstatus] = :false
+      end
+
+      it "should use the user-provided status command if present and return running if true" do
+        resource[:status] = '/bin/true'
+        subject.expects(:texecute).with(:status, ["/bin/true"], false).returns(0)
+        $CHILD_STATUS.stubs(:exitstatus).returns(0)
+        expect(subject.status).to eq(:running)
+      end
+
+      it "should use the user-provided status command if present and return stopped if false" do
+        resource[:status] = '/bin/false'
+        subject.expects(:texecute).with(:status, ["/bin/false"], false).returns(nil)
+        $CHILD_STATUS.stubs(:exitstatus).returns(1)
+        expect(subject.status).to eq(:stopped)
+      end
+
+      it "should fall back to getpid if no status command is provided" do
+        subject.expects(:getpid).returns(123)
+        expect(subject.status).to eq(:running)
+      end
+    end
   end
 
   [[10, '10.6'], [13, '10.9']].each do |kernel, version|

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

@@ -4,6 +4,12 @@ require 'spec_helper'
 
 describe Puppet::Type.type(:service).provider(:openrc) do
 
+  if Puppet.features.microsoft_windows?
+    # Get a pid for $CHILD_STATUS to latch on to
+    command = "cmd.exe /c \"exit 0\""
+    Puppet::Util::Execution.execute(command, {:failonfail => false})
+  end
+
   before :each do
     Puppet::Type.type(:service).stubs(:defaultprovider).returns described_class
     ['/sbin/rc-service', '/bin/rc-status', '/sbin/rc-update'].each do |command|

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

@@ -20,6 +20,9 @@ describe provider_class, :if => Puppet.features.posix? do
     FileTest.stubs(:executable?).with('/usr/sbin/svcadm').returns true
     FileTest.stubs(:file?).with('/usr/bin/svcs').returns true
     FileTest.stubs(:executable?).with('/usr/bin/svcs').returns true
+    Facter.stubs(:value).with(:operatingsystem).returns('Solaris')
+    Facter.stubs(:value).with(:osfamily).returns('Solaris')
+    Facter.stubs(:value).with(:operatingsystemrelease).returns '11.2'
   end
 
   describe ".instances" do
@@ -174,17 +177,39 @@ describe provider_class, :if => Puppet.features.posix? do
   end
 
   describe "when restarting" do
-    it "should call 'svcadm restart /system/myservice'" do
-      @provider.expects(:texecute).with(:restart, ["/usr/sbin/svcadm", :restart, "/system/myservice"], true)
-      @provider.expects(:wait).with('online')
-      @provider.restart
-    end
 
     it "should error if timeout occurs while restarting the service" do
-      @provider.expects(:texecute).with(:restart, ["/usr/sbin/svcadm", :restart, "/system/myservice"], true)
+      @provider.expects(:texecute).with(:restart, ["/usr/sbin/svcadm", :restart, "-s", "/system/myservice"], true)
       Timeout.expects(:timeout).with(60).raises(Timeout::Error)
       expect { @provider.restart }.to raise_error Puppet::Error, ('Timed out waiting for /system/myservice to transition states')
     end
 
+    context 'with :operatingsystemrelease == 10_u10' do
+      it "should call 'svcadm restart /system/myservice'" do
+        Facter.stubs(:value).with(:operatingsystemrelease).returns '10_u10'
+        @provider.expects(:texecute).with(:restart, ["/usr/sbin/svcadm", :restart, "/system/myservice"], true)
+        @provider.expects(:wait).with('online')
+        @provider.restart
+      end
+    end
+
+    context 'with :operatingsystemrelease == 11.2' do
+      it "should call 'svcadm restart -s /system/myservice'" do
+        Facter.stubs(:value).with(:operatingsystemrelease).returns '11.2'
+        @provider.expects(:texecute).with(:restart, ["/usr/sbin/svcadm", :restart, "-s", "/system/myservice"], true)
+        @provider.expects(:wait).with('online')
+        @provider.restart
+      end
+    end
+
+    context 'with :operatingsystemrelease > 11.2' do
+      it "should call 'svcadm restart -s /system/myservice'" do
+        Facter.stubs(:value).with(:operatingsystemrelease).returns '11.3'
+        @provider.expects(:texecute).with(:restart, ["/usr/sbin/svcadm", :restart, "-s", "/system/myservice"], true)
+        @provider.expects(:wait).with('online')
+        @provider.restart
+      end
+    end
+
   end
 end

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

@@ -9,6 +9,12 @@ provider_class = Puppet::Type.type(:service).provider(:src)
 
 describe provider_class do
 
+  if Puppet.features.microsoft_windows?
+    # Get a pid for $CHILD_STATUS to latch on to
+    command = "cmd.exe /c \"exit 0\""
+    Puppet::Util::Execution.execute(command, {:failonfail => false})
+  end
+
   before :each do
     @resource = stub 'resource'
     @resource.stubs(:[]).returns(nil)

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

@@ -5,6 +5,13 @@
 require 'spec_helper'
 
 describe Puppet::Type.type(:service).provider(:systemd) do
+
+  if Puppet.features.microsoft_windows?
+    # Get a pid for $CHILD_STATUS to latch on to
+    command = "cmd.exe /c \"exit 0\""
+    Puppet::Util::Execution.execute(command, {:failonfail => false})
+  end
+
   before :each do
     Puppet::Type.type(:service).stubs(:defaultprovider).returns described_class
     described_class.stubs(:which).with('systemctl').returns '/bin/systemctl'
@@ -51,6 +58,13 @@ describe Puppet::Type.type(:service).provider(:systemd) do
     end
   end
 
+  it "should be the default provider on cumulus3" do
+    Facter.stubs(:value).with(:osfamily).returns(:debian)
+    Facter.stubs(:value).with(:operatingsystem).returns('CumulusLinux')
+    Facter.stubs(:value).with(:operatingsystemmajrelease).returns("3")
+    expect(described_class).to be_default
+  end
+
   it "should be the default provider on sles12" do
     Facter.stubs(:value).with(:osfamily).returns(:suse)
     Facter.stubs(:value).with(:operatingsystemmajrelease).returns("12")
@@ -98,25 +112,13 @@ describe Puppet::Type.type(:service).provider(:systemd) do
     expect(described_class).not_to be_default
   end
 
-  it "should be the default provider on ubuntu15.04" do
-    Facter.stubs(:value).with(:osfamily).returns(:debian)
-    Facter.stubs(:value).with(:operatingsystem).returns(:ubuntu)
-    Facter.stubs(:value).with(:operatingsystemmajrelease).returns("15.04")
-    expect(described_class).to be_default
-  end
-
-  it "should be the default provider on ubuntu15.10" do
-    Facter.stubs(:value).with(:osfamily).returns(:debian)
-    Facter.stubs(:value).with(:operatingsystem).returns(:ubuntu)
-    Facter.stubs(:value).with(:operatingsystemmajrelease).returns("15.10")
-    expect(described_class).to be_default
-  end
-
-  it "should be the default provider on ubuntu16.04" do
-    Facter.stubs(:value).with(:osfamily).returns(:debian)
-    Facter.stubs(:value).with(:operatingsystem).returns(:ubuntu)
-    Facter.stubs(:value).with(:operatingsystemmajrelease).returns("16.04")
-    expect(described_class).to be_default
+  [ '15.04', '15.10', '16.04', '16.10' ].each do |ver|
+    it "should be the default provider on ubuntu#{ver}" do
+      Facter.stubs(:value).with(:osfamily).returns(:debian)
+      Facter.stubs(:value).with(:operatingsystem).returns(:ubuntu)
+      Facter.stubs(:value).with(:operatingsystemmajrelease).returns("#{ver}")
+      expect(described_class).to be_default
+    end
   end
 
   [:enabled?, :enable, :disable, :start, :stop, :status, :restart].each do |method|
@@ -152,9 +154,24 @@ describe Puppet::Type.type(:service).provider(:systemd) do
     it "should start the service with systemctl start otherwise" do
       provider = described_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service'))
       provider.expects(:systemctl).with(:unmask, 'sshd.service')
-      provider.expects(:execute).with(['/bin/systemctl','start','sshd.service'], :failonfail => true, :override_locale => false, :squelch => false, :combine => true)
+      provider.expects(:execute).with(['/bin/systemctl','start','sshd.service'], {:failonfail => true, :override_locale => false, :squelch => false, :combine => true})
       provider.start
     end
+
+    it "should show journald logs on failure" do
+      provider = described_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service'))
+      provider.expects(:systemctl).with(:unmask, 'sshd.service')
+      provider.expects(:execute).with(['/bin/systemctl','start','sshd.service'],{:failonfail => true, :override_locale => false, :squelch => false, :combine => true})
+        .raises(Puppet::ExecutionFailure, "Failed to start sshd.service: Unit sshd.service failed to load: Invalid argument. See system logs and 'systemctl status sshd.service' for details.")
+      journalctl_logs = <<-EOS
+-- Logs begin at Tue 2016-06-14 11:59:21 UTC, end at Tue 2016-06-14 21:45:02 UTC. --
+Jun 14 21:41:34 foo.example.com systemd[1]: Stopping sshd Service...
+Jun 14 21:41:35 foo.example.com systemd[1]: Starting sshd Service...
+Jun 14 21:43:23 foo.example.com systemd[1]: sshd.service lacks both ExecStart= and ExecStop= setting. Refusing.
+      EOS
+      provider.expects(:execute).with("journalctl -n 50 --since '5 minutes ago' -u sshd.service --no-pager").returns(journalctl_logs)
+      expect { provider.start }.to raise_error(Puppet::Error, /Systemd start for sshd.service failed![\n]+journalctl log for sshd.service:[\n]+-- Logs begin at Tue 2016-06-14 11:59:21 UTC, end at Tue 2016-06-14 21:45:02 UTC. --/m)
+    end
   end
 
   describe "#stop" do
@@ -169,36 +186,55 @@ describe Puppet::Type.type(:service).provider(:systemd) do
       provider.expects(:execute).with(['/bin/systemctl','stop','sshd.service'], :failonfail => true, :override_locale => false, :squelch => false, :combine => true)
       provider.stop
     end
+
+    it "should show journald logs on failure" do
+      provider = described_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service'))
+      provider.expects(:execute).with(['/bin/systemctl','stop','sshd.service'],{:failonfail => true, :override_locale => false, :squelch => false, :combine => true})
+        .raises(Puppet::ExecutionFailure, "Failed to stop sshd.service: Unit sshd.service failed to load: Invalid argument. See system logs and 'systemctl status sshd.service' for details.")
+      journalctl_logs = <<-EOS
+-- Logs begin at Tue 2016-06-14 11:59:21 UTC, end at Tue 2016-06-14 21:45:02 UTC. --
+Jun 14 21:41:34 foo.example.com systemd[1]: Stopping sshd Service...
+Jun 14 21:41:35 foo.example.com systemd[1]: Starting sshd Service...
+Jun 14 21:43:23 foo.example.com systemd[1]: sshd.service lacks both ExecStart= and ExecStop= setting. Refusing.
+      EOS
+      provider.expects(:execute).with("journalctl -n 50 --since '5 minutes ago' -u sshd.service --no-pager").returns(journalctl_logs)
+      expect { provider.stop }.to raise_error(Puppet::Error, /Systemd stop for sshd.service failed![\n]+journalctl log for sshd.service:[\n]-- Logs begin at Tue 2016-06-14 11:59:21 UTC, end at Tue 2016-06-14 21:45:02 UTC. --/m)
+    end
   end
 
   describe "#enabled?" do
     it "should return :true if the service is enabled" do
       provider = described_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service'))
       provider.expects(:execute).with(['/bin/systemctl','is-enabled','sshd.service'], :failonfail => false).returns "enabled\n"
+      $CHILD_STATUS.stubs(:exitstatus).returns(0)
       expect(provider.enabled?).to eq(:true)
     end
 
     it "should return :true if the service is static" do
       provider = described_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service'))
       provider.expects(:execute).with(['/bin/systemctl','is-enabled','sshd.service'], :failonfail => false).returns "static\n"
+      $CHILD_STATUS.stubs(:exitstatus).returns(0)
       expect(provider.enabled?).to eq(:true)
     end
 
     it "should return :false if the service is disabled" do
       provider = described_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service'))
       provider.expects(:execute).with(['/bin/systemctl','is-enabled','sshd.service'], :failonfail => false).returns "disabled\n"
+      $CHILD_STATUS.stubs(:exitstatus).returns(1)
       expect(provider.enabled?).to eq(:false)
     end
 
     it "should return :false if the service is masked and the resource is attempting to be disabled" do
       provider = described_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service', :enable => false))
       provider.expects(:execute).with(['/bin/systemctl','is-enabled','sshd.service'], :failonfail => false).returns "masked\n"
+      $CHILD_STATUS.stubs(:exitstatus).returns(1)
       expect(provider.enabled?).to eq(:false)
     end
 
     it "should return :mask if the service is masked and the resource is attempting to be masked" do
       provider = described_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service', :enable => 'mask'))
       provider.expects(:execute).with(['/bin/systemctl','is-enabled','sshd.service'], :failonfail => false).returns "masked\n"
+      $CHILD_STATUS.stubs(:exitstatus).returns(1)
       expect(provider.enabled?).to eq(:mask)
     end
   end
@@ -273,6 +309,20 @@ describe Puppet::Type.type(:service).provider(:systemd) do
       provider.expects(:execute).with(['/bin/systemctl','restart','sshd.service'], :failonfail => true, :override_locale => false, :squelch => false, :combine => true)
       provider.restart
     end
+
+    it "should show journald logs on failure" do
+      provider = described_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service'))
+      provider.expects(:execute).with(['/bin/systemctl','restart','sshd.service'],{:failonfail => true, :override_locale => false, :squelch => false, :combine => true})
+        .raises(Puppet::ExecutionFailure, "Failed to restart sshd.service: Unit sshd.service failed to load: Invalid argument. See system logs and 'systemctl status sshd.service' for details.")
+      journalctl_logs = <<-EOS
+-- Logs begin at Tue 2016-06-14 11:59:21 UTC, end at Tue 2016-06-14 21:45:02 UTC. --
+Jun 14 21:41:34 foo.example.com systemd[1]: Stopping sshd Service...
+Jun 14 21:41:35 foo.example.com systemd[1]: Starting sshd Service...
+Jun 14 21:43:23 foo.example.com systemd[1]: sshd.service lacks both ExecStart= and ExecStop= setting. Refusing.
+      EOS
+      provider.expects(:execute).with("journalctl -n 50 --since '5 minutes ago' -u sshd.service --no-pager").returns(journalctl_logs)
+      expect { provider.restart }.to raise_error(Puppet::Error, /Systemd restart for sshd.service failed![\n]+journalctl log for sshd.service:[\n]+-- Logs begin at Tue 2016-06-14 11:59:21 UTC, end at Tue 2016-06-14 21:45:02 UTC. --/m)
+    end
   end
 
   describe "#debian_enabled?" do

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

@@ -7,6 +7,12 @@ describe Puppet::Type.type(:service).provider(:upstart) do
   let(:start_on_default_runlevels) {  "\nstart on runlevel [2,3,4,5]" }
   let(:provider_class) { Puppet::Type.type(:service).provider(:upstart) }
 
+  if Puppet.features.microsoft_windows?
+    # Get a pid for $CHILD_STATUS to latch on to
+    command = "cmd.exe /c \"exit 0\""
+    Puppet::Util::Execution.execute(command, {:failonfail => false})
+  end
+
   def given_contents_of(file, content)
     File.open(file, 'w') do |file|
       file.write(content)

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

@@ -55,6 +55,7 @@ guest id=100 pgrp=usr groups=usr home=/home/guest
 
     describe "invoked via manifest" do
       let(:attribute_array) { ["rlogin=false", "login =true"] }
+      let(:single_attribute_array) { "rlogin=false" }
 
       it "should return only the keys of the attribute key=value pair from manifest" do
         keys = @provider.managed_attribute_keys(existing_attributes)
@@ -79,6 +80,12 @@ guest id=100 pgrp=usr groups=usr home=/home/guest
         all_symbols = keys.all? {|k| k.is_a? Symbol}
         expect(all_symbols).to be_truthy
       end
+
+      it "should allow a single attribute to be specified" do
+        @resource.stubs(:original_parameters).returns({ :attributes => single_attribute_array })
+        keys = @provider.managed_attribute_keys(existing_attributes)
+        keys.should be_include(:rlogin)
+      end
     end
 
     describe "invoked via RAL" do

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

@@ -350,6 +350,33 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
     end
   end
 
+  describe 'self#generate_attribute_hash empty shadowhashdata' do
+    let(:user_plist_resource) do
+      {
+        :ensure         => :present,
+        :provider       => :directoryservice,
+        :groups         => 'testgroup,third',
+        :comment        => username,
+        :password       => '*',
+        :shadowhashdata => nil,
+        :name           => username,
+        :uid            => 1000,
+        :gid            => 22,
+        :home           => user_path
+      }
+    end
+
+    it 'should handle empty shadowhashdata' do
+      provider.class.stubs(:get_os_version).returns('10.7')
+      provider.class.stubs(:get_all_users).returns(testuser_hash)
+      provider.class.stubs(:get_attribute_from_dscl).with('Users', username, 'ShadowHashData').returns(nil)
+      provider.class.stubs(:get_list_of_groups).returns(group_plist_hash_guid)
+      provider.class.stubs(:convert_binary_to_hash).with(sha512_embedded_bplist).returns(sha512_embedded_bplist_hash)
+      provider.class.prefetch({})
+      expect(provider.class.generate_attribute_hash(user_plist_hash)).to eq(user_plist_resource)
+    end
+  end
+
   describe '#exists?' do
     # This test expects an error to be raised
     # I'm PROBABLY doing this wrong...
@@ -849,13 +876,14 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
     # This will also catch the edge-case where a 10.6-style user exists on
     # a 10.8 system and Puppet attempts to set a password
     it 'should not fail if shadow_hash_data is not a Hash' do
-      provider.expects(:base64_decode_string).with(pbkdf2_password_hash).returns('binary_string')
+      Puppet::Util::Plist.expects(:string_to_blob).with(provider.base64_decode_string(pbkdf2_password_hash)).returns('binary_string')
       provider.class.expects(:convert_hash_to_binary).with(entropy_shadow_hash_data).returns('binary_plist')
       provider.expects(:set_shadow_hash_data).with({'passwd' => '********'}, 'binary_plist')
       provider.set_salted_pbkdf2({}, false, 'entropy', pbkdf2_password_hash)
     end
 
     it "should set the PBKDF2 password hash when the 'entropy' field is passed with a valid password hash" do
+      Puppet::Util::Plist.expects(:string_to_blob).with(provider.base64_decode_string(pbkdf2_password_hash))
       provider.class.expects(:convert_hash_to_binary).with(pbkdf2_embedded_bplist_hash).returns(pbkdf2_embedded_plist)
       provider.expects(:set_shadow_hash_data).with(users_plist, pbkdf2_embedded_plist)
       users_plist.expects(:[]=).with('passwd', '********')
@@ -863,6 +891,7 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
     end
 
     it "should set the PBKDF2 password hash when the 'salt' field is passed with a valid password hash" do
+      Puppet::Util::Plist.expects(:string_to_blob).with(provider.base64_decode_string(pbkdf2_salt_value))
       provider.class.expects(:convert_hash_to_binary).with(pbkdf2_embedded_bplist_hash).returns(pbkdf2_embedded_plist)
       provider.expects(:set_shadow_hash_data).with(users_plist, pbkdf2_embedded_plist)
       users_plist.expects(:[]=).with('passwd', '********')