puppet 4.3.2-x64-mingw32 → 4.4.0-x64-mingw32

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

@@ -151,12 +151,14 @@ describe provider_class do
 
   describe "get_latest_version" do
     it "should rereturn nil when the current package is the latest" do
-      nmap_latest_version = provider_class.get_latest_version('security/nmap')
+      version_list = File.read(my_fixture('pkg.version'))
+      nmap_latest_version = provider_class.get_latest_version('security/nmap', version_list)
       expect(nmap_latest_version).to be_nil
     end
 
     it "should match the package name exactly" do
-      bash_comp_latest_version = provider_class.get_latest_version('shells/bash-completion')
+      version_list = File.read(my_fixture('pkg.version'))
+      bash_comp_latest_version = provider_class.get_latest_version('shells/bash-completion', version_list)
       expect(bash_comp_latest_version).to eq('2.1_3')
     end
   end

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

@@ -505,6 +505,17 @@ describe provider_class do
         expect(output).to include("yum-plugin-fastestmirror.noarch")
       end
     end
+    describe "with broken update notices" do
+      let(:check_update) { File.read(my_fixture('yum-check-update-broken-notices.txt')) }
+      let(:output) { described_class.parse_updates(check_update) }
+
+      it "ignores all entries including and after 'Update'" do
+        expect(output).not_to include("Update")
+      end
+      it "includes updates before 'Update'" do
+        expect(output).to include("yum-plugin-fastestmirror.noarch")
+      end
+    end
   end
 
   describe "parsing a line from yum check-update" do

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

@@ -214,4 +214,18 @@ describe provider_class do
       @provider.install
     end
   end
+
+  describe 'when uninstalling' do
+    it 'should use remove to uninstall on zypper version 1.6 and above' do
+      @provider.stubs(:zypper_version).returns '1.6.308'
+      @provider.expects(:zypper).with(:remove, '--no-confirm', 'mypackage')
+      @provider.uninstall
+    end
+
+    it 'should use remove  --force-solution to uninstall on zypper versions between 1.0 and 1.6' do
+      @provider.stubs(:zypper_version).returns '1.0.2'
+      @provider.expects(:zypper).with(:remove, '--no-confirm', '--force-resolution', 'mypackage')
+      @provider.uninstall
+    end
+  end
 end

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

@@ -4,6 +4,7 @@
 require 'spec_helper'
 
 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) }
@@ -43,21 +44,21 @@ describe Puppet::Type.type(:service).provider(:launchd) do
       it "should return true if the job plist says disabled is true and the global overrides says disabled is false" do
         provider.expects(:get_os_version).returns(kernel).at_least_once
         subject.expects(:plist_from_label).returns([joblabel, {"Disabled" => true}])
-        provider.expects(:read_plist).with(launchd_overrides_6_9).returns({joblabel => {"Disabled" => false}})
+        plistlib.expects(:read_plist_file).with(launchd_overrides_6_9).returns({joblabel => {"Disabled" => false}})
         FileTest.expects(:file?).with(launchd_overrides_6_9).returns(true)
         expect(subject.enabled?).to eq(:true)
       end
       it "should return false if the job plist says disabled is false and the global overrides says disabled is true" do
         provider.expects(:get_os_version).returns(kernel).at_least_once
         subject.expects(:plist_from_label).returns([joblabel, {"Disabled" => false}])
-        provider.expects(:read_plist).with(launchd_overrides_6_9).returns({joblabel => {"Disabled" => true}})
+        plistlib.expects(:read_plist_file).with(launchd_overrides_6_9).returns({joblabel => {"Disabled" => true}})
         FileTest.expects(:file?).with(launchd_overrides_6_9).returns(true)
         expect(subject.enabled?).to eq(:false)
       end
       it "should return true if the job plist and the global overrides have no disabled keys" do
         provider.expects(:get_os_version).returns(kernel).at_least_once
         subject.expects(:plist_from_label).returns([joblabel, {}])
-        provider.expects(:read_plist).with(launchd_overrides_6_9).returns({})
+        plistlib.expects(:read_plist_file).with(launchd_overrides_6_9).returns({})
         FileTest.expects(:file?).with(launchd_overrides_6_9).returns(true)
         expect(subject.enabled?).to eq(:true)
       end
@@ -68,21 +69,21 @@ describe Puppet::Type.type(:service).provider(:launchd) do
     it "should return true if the job plist says disabled is true and the global overrides says disabled is false" do
       provider.expects(:get_os_version).returns(14).at_least_once
       subject.expects(:plist_from_label).returns([joblabel, {"Disabled" => true}])
-      provider.expects(:read_plist).with(launchd_overrides_10_).returns({joblabel => false})
+      plistlib.expects(:read_plist_file).with(launchd_overrides_10_).returns({joblabel => false})
       FileTest.expects(:file?).with(launchd_overrides_10_).returns(true)
       expect(subject.enabled?).to eq(:true)
     end
     it "should return false if the job plist says disabled is false and the global overrides says disabled is true" do
       provider.expects(:get_os_version).returns(14).at_least_once
       subject.expects(:plist_from_label).returns([joblabel, {"Disabled" => false}])
-      provider.expects(:read_plist).with(launchd_overrides_10_).returns({joblabel => true})
+      plistlib.expects(:read_plist_file).with(launchd_overrides_10_).returns({joblabel => true})
       FileTest.expects(:file?).with(launchd_overrides_10_).returns(true)
       expect(subject.enabled?).to eq(:false)
     end
     it "should return true if the job plist and the global overrides have no disabled keys" do
       provider.expects(:get_os_version).returns(14).at_least_once
       subject.expects(:plist_from_label).returns([joblabel, {}])
-      provider.expects(:read_plist).with(launchd_overrides_10_).returns({})
+      plistlib.expects(:read_plist_file).with(launchd_overrides_10_).returns({})
       FileTest.expects(:file?).with(launchd_overrides_10_).returns(true)
       expect(subject.enabled?).to eq(:true)
     end
@@ -203,8 +204,8 @@ describe Puppet::Type.type(:service).provider(:launchd) do
       it "should write to the global launchd overrides file once" do
         resource[:enable] = true
         provider.expects(:get_os_version).returns(kernel).at_least_once
-        provider.expects(:read_plist).with(launchd_overrides_6_9).returns({})
-        Plist::Emit.expects(:save_plist).with(has_entry(resource[:name], {'Disabled' => false}), launchd_overrides_6_9).once
+        plistlib.expects(:read_plist_file).with(launchd_overrides_6_9).returns({})
+        plistlib.expects(:write_plist_file).with(has_entry(resource[:name], {'Disabled' => false}), launchd_overrides_6_9).once
         subject.enable
       end
     end
@@ -213,8 +214,8 @@ describe Puppet::Type.type(:service).provider(:launchd) do
       it "should write to the global launchd overrides file once" do
         resource[:enable] = false
         provider.expects(:get_os_version).returns(kernel).at_least_once
-        provider.expects(:read_plist).with(launchd_overrides_6_9).returns({})
-        Plist::Emit.expects(:save_plist).with(has_entry(resource[:name], {'Disabled' => true}), launchd_overrides_6_9).once
+        plistlib.expects(:read_plist_file).with(launchd_overrides_6_9).returns({})
+        plistlib.expects(:write_plist_file).with(has_entry(resource[:name], {'Disabled' => true}), launchd_overrides_6_9).once
         subject.disable
       end
     end
@@ -224,8 +225,8 @@ describe Puppet::Type.type(:service).provider(:launchd) do
     it "should write to the global launchd overrides file once" do
       resource[:enable] = true
       provider.expects(:get_os_version).returns(14).at_least_once
-      provider.expects(:read_plist).with(launchd_overrides_10_).returns({})
-      Plist::Emit.expects(:save_plist).with(has_entry(resource[:name], false), launchd_overrides_10_).once
+      plistlib.expects(:read_plist_file).with(launchd_overrides_10_).returns({})
+      plistlib.expects(:write_plist_file).with(has_entry(resource[:name], false), launchd_overrides_10_).once
       subject.enable
     end
   end
@@ -234,8 +235,8 @@ describe Puppet::Type.type(:service).provider(:launchd) do
     it "should write to the global launchd overrides file once" do
       resource[:enable] = false
       provider.expects(:get_os_version).returns(14).at_least_once
-      provider.expects(:read_plist).with(launchd_overrides_10_).returns({})
-      Plist::Emit.expects(:save_plist).with(has_entry(resource[:name], true), launchd_overrides_10_).once
+      plistlib.expects(:read_plist_file).with(launchd_overrides_10_).returns({})
+      plistlib.expects(:write_plist_file).with(has_entry(resource[:name], true), launchd_overrides_10_).once
       subject.disable
     end
   end
@@ -259,29 +260,10 @@ describe Puppet::Type.type(:service).provider(:launchd) do
       it "[17624] should warn that the plist in question is being skipped" do
         provider.expects(:launchd_paths).returns(['/Library/LaunchAgents'])
         provider.expects(:return_globbed_list_of_file_paths).with('/Library/LaunchAgents').returns([busted_plist_path])
-        provider.expects(:read_plist).with(busted_plist_path).returns(plist_without_label)
+        plistlib.expects(:read_plist_file).with(busted_plist_path).returns(plist_without_label)
         Puppet.expects(:warning).with("The #{busted_plist_path} plist does not contain a 'label' key; Puppet is skipping it")
         provider.make_label_to_path_map
       end
-
-      it "[15929] should skip plists that plutil cannot read" do
-        Plist.expects(:parse_xml).with(busted_plist_path).raises(ArgumentError, 'boom')
-        Puppet.expects(:debug).with("Error reading #{busted_plist_path}: boom. Retrying with plutil.")
-        provider.expects(:plutil).with('-convert', 'xml1', '-o', '/dev/stdout',
-          busted_plist_path).raises(Puppet::ExecutionFailure, 'boom')
-        Puppet.expects(:warning).with("Cannot read file #{busted_plist_path}; " +
-                                      "Puppet is skipping it. \n" +
-                                      "Details: boom")
-        provider.read_plist(busted_plist_path)
-      end
-
-      it "should read binary plists with plutil" do
-        Plist.expects(:parse_xml).with(binary_plist_path).raises(ArgumentError, 'boom')
-        Puppet.expects(:debug).with("Error reading #{binary_plist_path}: boom. Retrying with plutil.")
-        provider.expects(:plutil).with('-convert', 'xml1', '-o', '/dev/stdout', binary_plist_path).returns('plist')
-        Plist.expects(:parse_xml).with('plist').returns('plist_map')
-        expect(provider.read_plist(binary_plist_path)).to eq('plist_map')
-      end
     end
     it "should return the cached value when available" do
       provider.instance_variable_set(:@label_to_path_map, {'xx'=>'yy'})
@@ -295,7 +277,7 @@ describe Puppet::Type.type(:service).provider(:launchd) do
         provider.instance_variable_set(:@label_to_path_map, nil)
         provider.expects(:launchd_paths).returns([launchd_dir])
         provider.expects(:return_globbed_list_of_file_paths).with(launchd_dir).returns([plist])
-        provider.expects(:read_plist).with(plist).returns({'Label'=>'foo.bar.service'})
+        plistlib.expects(:read_plist_file).with(plist).returns({'Label'=>'foo.bar.service'})
       end
       it "should read the plists and return their contents" do
         expect(provider.make_label_to_path_map).to eq({label=>plist})

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

@@ -112,6 +112,13 @@ describe Puppet::Type.type(:service).provider(:systemd) do
     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
+  end
+
   [:enabled?, :enable, :disable, :start, :stop, :status, :restart].each do |method|
     it "should have a #{method} method" do
       expect(provider).to respond_to(method)

data/spec/unit/provider/sshkey/parsed_spec.rb

@@ -41,30 +41,31 @@ describe "sshkey parsed provider" do
   end
 
   context "with the sample file" do
-    let :fixture do my_fixture('sample') end
-    before :each do subject.stubs(:default_target).returns(fixture) end
+    ['sample', 'sample_with_blank_lines'].each do |sample_file|
+      let :fixture do my_fixture(sample_file) end
+      before :each do subject.stubs(:default_target).returns(fixture) end
 
-    it "should parse to records on prefetch" do
-      expect(subject.target_records(fixture)).to be_empty
-      subject.prefetch
+      it "should parse to records on prefetch" do
+        expect(subject.target_records(fixture)).to be_empty
+        subject.prefetch
 
-      records = subject.target_records(fixture)
-      expect(records).to be_an Array
-      expect(records).to be_all {|x| expect(x).to be_an Hash }
-    end
-
-    it "should reconstitute the file from records" do
-      subject.prefetch
-      records = subject.target_records(fixture)
+        records = subject.target_records(fixture)
+        expect(records).to be_an Array
+        expect(records).to be_all {|x| expect(x).to be_an Hash }
+      end
 
-      text = subject.to_file(records).gsub(/^# HEADER.+\n/, '')
+      it "should reconstitute the file from records" do
+        subject.prefetch
+        records = subject.target_records(fixture)
+        text = subject.to_file(records).gsub(/^# HEADER.+\n/, '')
 
-      oldlines = File.readlines(fixture).map(&:chomp)
-      newlines = text.chomp.split("\n")
-      expect(oldlines.length).to eq(newlines.length)
+        oldlines = File.readlines(fixture).map(&:chomp)
+        newlines = text.chomp.split("\n")
+        expect(oldlines.length).to eq(newlines.length)
 
-      oldlines.zip(newlines).each do |old, new|
-        expect(old.gsub(/\s+/, '')).to eq(new.gsub(/\s+/, ''))
+        oldlines.zip(newlines).each do |old, new|
+          expect(old.gsub(/\s+/, '')).to eq(new.gsub(/\s+/, ''))
+        end
       end
     end
   end

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

@@ -1,7 +1,9 @@
 #! /usr/bin/env ruby -S rspec
 # encoding: ASCII-8BIT
 require 'spec_helper'
-require 'plist'
+
+module Puppet::Util::Plist
+end
 
 describe Puppet::Type.type(:user).provider(:directoryservice) do
   let(:username) { 'nonexistent_user' }
@@ -14,7 +16,6 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
   end
   let(:provider) { resource.provider }
   let(:users_plist_dir) { '/var/db/dslocal/nodes/Default/users' }
-  let(:stringio_object) { StringIO.new('new_stringio_object') }
 
   # This is the output of doing `dscl -plist . read /Users/<username>` which
   # will return a hash of keys whose values are all arrays.
@@ -82,9 +83,9 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
 
   # The below is the result of converting sha512_embedded_bplist to XML and
   # parsing it with Plist.parse_xml. It is a Ruby Hash whose value is a
-  # StringIO object holding a Base64 encoded salted-SHA512 password hash.
+  # Base64 encoded salted-SHA512 password hash.
   let(:sha512_embedded_bplist_hash) do
-    { 'SALTED-SHA512' => StringIO.new(sha512_pw_string) }
+    { 'SALTED-SHA512' => sha512_pw_string }
   end
 
   # The value below is the result of converting sha512_pw_string to Hex.
@@ -106,8 +107,8 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
   let(:pbkdf2_embedded_bplist_hash) do
     {
       'SALTED-SHA512-PBKDF2' => {
-        'entropy'    => StringIO.new(pbkdf2_pw_string),
-        'salt'       => StringIO.new(pbkdf2_salt_string),
+        'entropy'    => pbkdf2_pw_string,
+        'salt'       => pbkdf2_salt_string,
         'iterations' => pbkdf2_iterations_value
       }
     }
@@ -290,7 +291,7 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
     end
   end
 
-  describe 'self#get_all_users' do
+  describe 'self#get_all_users', :if => Puppet.features.cfpropertylist? do
     let(:empty_plist) do
       '<?xml version="1.0" encoding="UTF-8"?>
       <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -332,7 +333,7 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
       provider.class.stubs(:get_all_users).returns(testuser_hash)
       provider.class.stubs(:get_attribute_from_dscl).with('Users', username, 'ShadowHashData').returns(sha512_shadowhashdata_hash)
       provider.class.stubs(:get_list_of_groups).returns(group_plist_hash_guid)
-      provider.class.stubs(:convert_binary_to_xml).with(sha512_embedded_bplist).returns(sha512_embedded_bplist_hash)
+      provider.class.stubs(:convert_binary_to_hash).with(sha512_embedded_bplist).returns(sha512_embedded_bplist_hash)
       provider.class.prefetch({})
     end
 
@@ -488,13 +489,13 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
 
     it 'should call the get_salted_sha512 method on 10.7 and return the correct hash' do
       provider.class.expects(:get_attribute_from_dscl).with('Users', username, 'ShadowHashData').returns(sha512_shadowhashdata_hash)
-      provider.class.expects(:convert_binary_to_xml).with(sha512_embedded_bplist).returns(sha512_embedded_bplist_hash)
+      provider.class.expects(:convert_binary_to_hash).with(sha512_embedded_bplist).returns(sha512_embedded_bplist_hash)
       expect(provider.class.prefetch({}).first.password).to eq(sha512_password_hash)
     end
 
     it 'should call the get_salted_sha512_pbkdf2 method on 10.8 and return the correct hash' do
       provider.class.expects(:get_attribute_from_dscl).with('Users', username,'ShadowHashData').returns(pbkdf2_shadowhashdata_hash)
-      provider.class.expects(:convert_binary_to_xml).with(pbkdf2_embedded_plist).returns(pbkdf2_embedded_bplist_hash)
+      provider.class.expects(:convert_binary_to_hash).with(pbkdf2_embedded_plist).returns(pbkdf2_embedded_bplist_hash)
       expect(provider.class.prefetch({}).first.password).to eq(pbkdf2_password_hash)
     end
 
@@ -566,7 +567,7 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
     end
   end
 
-  describe '#get_list_of_groups' do
+  describe '#get_list_of_groups', :if => Puppet.features.cfpropertylist? do
     # The below value is the result of running `dscl -plist . readall /Groups`
     # on an OS X system.
     let(:groups_xml) do
@@ -633,7 +634,7 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
     end
   end
 
-  describe '#get_attribute_from_dscl' do
+  describe '#get_attribute_from_dscl', :if => Puppet.features.cfpropertylist? do
     # The below value is the result of executing
     # `dscl -plist . read /Users/<username/ GeneratedUID`
     # on an OS X system.
@@ -662,30 +663,17 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
     end
   end
 
-  describe '#convert_xml_to_binary' do
-    # Because this method relies on a binary that only exists on OS X, a stub
-    # object is needed to expect the calls. This makes testing somewhat...uneventful
-    let(:stub_io_object) { stub('connection') }
-
+  describe '#convert_hash_to_binary' do
     it 'should use plutil to successfully convert an xml plist to a binary plist' do
-      IO.expects(:popen).with('plutil -convert binary1 -o - -', 'r+').yields stub_io_object
-      Plist::Emit.expects(:dump).with('ruby_hash').returns('xml_plist_data')
-      stub_io_object.expects(:write).with('xml_plist_data')
-      stub_io_object.expects(:close_write)
-      stub_io_object.expects(:read).returns('binary_plist_data')
-      expect(provider.class.convert_xml_to_binary('ruby_hash')).to eq('binary_plist_data')
+      Puppet::Util::Plist.expects(:dump_plist).with('ruby_hash', :binary).returns('binary_plist_data')
+      expect(provider.class.convert_hash_to_binary('ruby_hash')).to eq('binary_plist_data')
     end
   end
 
-  describe '#convert_binary_to_xml' do
-    let(:stub_io_object) { stub('connection') }
-
+  describe '#convert_binary_to_hash' do
     it 'should accept a binary plist and return a ruby hash containing the plist data' do
-      IO.expects(:popen).with('plutil -convert xml1 -o - -', 'r+').yields stub_io_object
-      stub_io_object.expects(:write).with('binary_plist_data')
-      stub_io_object.expects(:close_write)
-      stub_io_object.expects(:read).returns(user_plist_xml)
-      expect(provider.class.convert_binary_to_xml('binary_plist_data')).to eq(user_plist_hash)
+      Puppet::Util::Plist.expects(:parse_plist).with('binary_plist_data').returns(user_plist_hash)
+      expect(provider.class.convert_binary_to_hash('binary_plist_data')).to eq(user_plist_hash)
     end
   end
 
@@ -697,7 +685,7 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
   end
 
   describe '#get_salted_sha512' do
-    it "should accept a hash whose 'SALTED-SHA512' key contains a StringIO object with a base64 encoded salted-SHA512 password hash and return the hex value of that password hash" do
+    it "should accept a hash whose 'SALTED-SHA512' key contains a base64 encoded salted-SHA512 password hash and return the hex value of that password hash" do
       expect(provider.class.get_salted_sha512(sha512_embedded_bplist_hash)).to eq(sha512_password_hash)
     end
   end
@@ -764,15 +752,15 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
 
     let(:sha512_shadowhashdata) do
       {
-        'SALTED-SHA512' => StringIO.new('blankvalue')
+        'SALTED-SHA512' => 'blankvalue'
       }
     end
 
     let(:pbkdf2_shadowhashdata) do
       {
         'SALTED-SHA512-PBKDF2' => {
-          'entropy'    => StringIO.new('blank_entropy'),
-          'salt'       => StringIO.new('blank_salt'),
+          'entropy'    => 'blank_entropy',
+          'salt'       => 'blank_salt',
           'iterations' => 100
         }
       }
@@ -797,7 +785,7 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
           ";Kerberosv5;;puppet@LKDC:S HA1.35580B1D6366D2890A35D430373FF653297F377D;LKDC:SHA1.35580B1D6366D2890A35D430373FF653297F377D"],
         "_writers_realname"        => ["puppet"],
         "_writers_hint"            => ["puppet"],
-        "ShadowHashData"           => [StringIO.new('blank')]
+        "ShadowHashData"           => ['blank']
       }
     end
 
@@ -827,34 +815,33 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
   end
 
   describe '#set_salted_sha512' do
-    let(:users_plist) { {'ShadowHashData' => [StringIO.new('string_data')] } }
+    let(:users_plist) { {'ShadowHashData' => ['string_data'] } }
     let(:sha512_shadow_hash_data) do
       {
-        'SALTED-SHA512' => stringio_object
+        'SALTED-SHA512' => sha512_pw_string
       }
     end
 
     it 'should set the SALTED-SHA512 password hash for a user in 10.7 and call the set_shadow_hash_data method to write the plist to disk' do
-      provider.class.expects(:convert_xml_to_binary).with(sha512_embedded_bplist_hash).returns(sha512_embedded_bplist)
+      provider.class.expects(:convert_hash_to_binary).with(sha512_embedded_bplist_hash).returns(sha512_embedded_bplist)
       provider.expects(:set_shadow_hash_data).with(users_plist, sha512_embedded_bplist)
       provider.set_salted_sha512(users_plist, sha512_embedded_bplist_hash, sha512_password_hash)
     end
 
     it 'should set the salted-SHA512 password, even if a blank shadow_hash_data hash is passed' do
-      provider.expects(:new_stringio_object).returns(stringio_object)
-      provider.class.expects(:convert_xml_to_binary).with(sha512_shadow_hash_data).returns(sha512_embedded_bplist)
+      provider.class.expects(:convert_hash_to_binary).with(sha512_shadow_hash_data).returns(sha512_embedded_bplist)
       provider.expects(:set_shadow_hash_data).with(users_plist, sha512_embedded_bplist)
       provider.set_salted_sha512(users_plist, false, sha512_password_hash)
     end
   end
 
   describe '#set_salted_pbkdf2' do
-    let(:users_plist) { {'ShadowHashData' => [StringIO.new('string_data')] } }
+    let(:users_plist) { {'ShadowHashData' => ['string_data'] } }
     let(:entropy_shadow_hash_data) do
       {
         'SALTED-SHA512-PBKDF2' =>
         {
-          'entropy' => stringio_object
+          'entropy' => 'binary_string'
         }
       }
     end
@@ -862,29 +849,28 @@ 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(:new_stringio_object).returns(stringio_object)
       provider.expects(:base64_decode_string).with(pbkdf2_password_hash).returns('binary_string')
-      provider.class.expects(:convert_xml_to_binary).with(entropy_shadow_hash_data).returns('binary_plist')
+      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
-      provider.class.expects(:convert_xml_to_binary).with(pbkdf2_embedded_bplist_hash).returns(pbkdf2_embedded_plist)
+      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', '********')
       provider.set_salted_pbkdf2(users_plist, pbkdf2_embedded_bplist_hash, 'entropy', pbkdf2_password_hash)
     end
 
     it "should set the PBKDF2 password hash when the 'salt' field is passed with a valid password hash" do
-      provider.class.expects(:convert_xml_to_binary).with(pbkdf2_embedded_bplist_hash).returns(pbkdf2_embedded_plist)
+      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', '********')
       provider.set_salted_pbkdf2(users_plist, pbkdf2_embedded_bplist_hash, 'salt', pbkdf2_salt_value)
     end
 
     it "should set the PBKDF2 password hash when the 'iterations' field is passed with a valid password hash" do
-      provider.class.expects(:convert_xml_to_binary).with(pbkdf2_embedded_bplist_hash).returns(pbkdf2_embedded_plist)
+      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', '********')
       provider.set_salted_pbkdf2(users_plist, pbkdf2_embedded_bplist_hash, 'iterations', pbkdf2_iterations_value)
@@ -893,8 +879,7 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
 
   describe '#write_users_plist_to_disk' do
     it 'should save the passed plist to disk and convert it to a binary plist' do
-      Plist::Emit.expects(:save_plist).with(user_plist_xml, "#{users_plist_dir}/nonexistent_user.plist")
-      provider.expects(:plutil).with('-convert', 'binary1', "#{users_plist_dir}/nonexistent_user.plist")
+      Puppet::Util::Plist.expects(:write_plist_file).with(user_plist_xml, "#{users_plist_dir}/nonexistent_user.plist", :binary)
       provider.write_users_plist_to_disk(user_plist_xml)
     end
   end
@@ -907,10 +892,6 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
   end
 
   describe '#get_users_plist' do
-    let(:test_plist) do
-      "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n<dict>\n\t<key>shell</key>\n\t<string>/bin/bash</string>\n\t<key>user</key>\n\t<string>puppet</string>\n</dict>\n</plist>\n"
-    end
-
     let(:test_hash) do
       {
         'user'  => 'puppet',
@@ -919,15 +900,15 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
     end
 
     it 'should convert a plist to a valid Ruby hash' do
-      provider.expects(:plutil).with('-convert', 'xml1', '-o', '/dev/stdout', "#{users_plist_dir}/#{username}.plist").returns(test_plist)
-      expect(provider.get_users_plist(username)).to eq(test_hash)
+      Puppet::Util::Plist.expects(:read_plist_file).with("#{users_plist_dir}/#{username}.plist").returns(test_hash)
+      expect(provider.get_users_plist(username)).to eq(test_hash, )
     end
   end
 
   describe '#get_shadow_hash_data' do
     let(:shadow_hash) do
       {
-        'ShadowHashData' => [StringIO.new('test')]
+        'ShadowHashData' => ['test']
       }
     end
 
@@ -941,10 +922,10 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
       expect(provider.get_shadow_hash_data(no_shadow_hash)).to eq(false)
     end
 
-    it 'should call convert_binary_to_xml() with the contents of the StringIO Object ' +
+    it 'should call convert_binary_to_hash() with the string ' +
        'located in the first element of the array of the ShadowHashData key if the ' +
        'passed users_plist contains a ShadowHashData key' do
-      provider.class.expects(:convert_binary_to_xml).with('test').returns('returnvalue')
+      provider.class.expects(:convert_binary_to_hash).with('test').returns('returnvalue')
       expect(provider.get_shadow_hash_data(shadow_hash)).to eq('returnvalue')
     end
   end