puppet 2.7.9 → 2.7.11

data/spec/unit/provider/augeas/augeas_spec.rb

@@ -353,7 +353,7 @@ describe provider_class do
         @augeas_stub = stub("augeas")
         @provider.aug = @augeas_stub
 
-        @augeas_stub.stubs("get").with("/augeas/version").returns("0.7.2")
+        @augeas_stub.stubs("get").with("/augeas/version").returns("0.10.0")
         @augeas_stub.stubs(:set).returns(true)
         @augeas_stub.stubs(:save).returns(true)
       end
@@ -467,7 +467,7 @@ describe provider_class do
       @augeas = stub("augeas")
       @provider.aug= @augeas
       @provider.stubs(:get_augeas_version).returns("0.3.5")
-      @augeas.stubs(:match).with("/augeas/events/saved")
+      @augeas.stubs(:match).with("/augeas/events/saved").returns([])
     end
 
     it "should handle set commands" do

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

@@ -0,0 +1,81 @@
+#!/usr/bin/env rspec
+require 'spec_helper'
+
+provider_class = Puppet::Type.type(:group).provider(:pw)
+
+describe provider_class do
+  let :resource do
+    Puppet::Type.type(:group).new(:name => "testgroup", :provider => :pw)
+  end
+
+  let :provider do
+    resource.provider
+  end
+
+  describe "when creating groups" do
+    let :provider do
+      prov = resource.provider
+      prov.expects(:exists?).returns nil
+      prov
+    end
+
+    it "should run pw with no additional flags when no properties are given" do
+      provider.addcmd.must == [provider_class.command(:pw), "groupadd", "testgroup"]
+      provider.expects(:execute).with([provider_class.command(:pw), "groupadd", "testgroup"])
+      provider.create
+    end
+
+    it "should use -o when allowdupe is enabled" do
+      resource[:allowdupe] = true
+      provider.expects(:execute).with(includes("-o"))
+      provider.create
+    end
+
+    it "should use -g with the correct argument when the gid property is set" do
+      resource[:gid] = 12345
+      provider.expects(:execute).with(all_of(includes("-g"), includes(12345)))
+      provider.create
+    end
+
+    it "should use -M with the correct argument when the members property is set" do
+      resource[:members] = "user1"
+      provider.expects(:execute).with(all_of(includes("-M"), includes("user1")))
+      provider.create
+    end
+
+    it "should use -M with all the given users when the members property is set to an array" do
+      resource[:members] = ["user1", "user2"]
+      provider.expects(:execute).with(all_of(includes("-M"), includes("user1,user2")))
+      provider.create
+    end
+  end
+
+  describe "when deleting groups" do
+    it "should run pw with no additional flags" do
+      provider.expects(:exists?).returns true
+      provider.deletecmd.must == [provider_class.command(:pw), "groupdel", "testgroup"]
+      provider.expects(:execute).with([provider_class.command(:pw), "groupdel", "testgroup"])
+      provider.delete
+    end
+  end
+
+  describe "when modifying groups" do
+    it "should run pw with the correct arguments" do
+      provider.modifycmd("gid", 12345).must == [provider_class.command(:pw), "groupmod", "testgroup", "-g", 12345]
+      provider.expects(:execute).with([provider_class.command(:pw), "groupmod", "testgroup", "-g", 12345])
+      provider.gid = 12345
+    end
+
+    it "should use -M with the correct argument when the members property is changed" do
+      resource[:members] = "user1"
+      provider.expects(:execute).with(all_of(includes("-M"), includes("user2")))
+      provider.members = "user2"
+    end
+
+    it "should use -M with all the given users when the members property is changed with an array" do
+      resource[:members] = ["user1", "user2"]
+      provider.expects(:execute).with(all_of(includes("-M"), includes("user3,user4")))
+      provider.members = ["user3", "user4"]
+    end
+  end
+end

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

@@ -95,3 +95,105 @@ describe 'DirectoryService.get_exec_preamble' do
     Puppet::Provider::NameService::DirectoryService.get_exec_preamble('-list').should include("-plist")
   end
 end
+
+describe 'DirectoryService password behavior' do
+  # The below is a binary plist containing a ShadowHashData key which CONTAINS
+  # another binary plist. The nested binary plist contains a 'SALTED-SHA512'
+  # key that contains a base64 encoded salted-SHA512 password hash...
+  let (:binary_plist) { "bplist00\324\001\002\003\004\005\006\a\bXCRAM-MD5RNT]SALTED-SHA512[RECOVERABLEO\020 \231k2\3360\200GI\201\355J\216\202\215y\243\001\206J\300\363\032\031\022\006\2359\024\257\217<\361O\020\020F\353\at\377\277\226\276c\306\254\031\037J(\235O\020D\335\006{\3744g@\377z\204\322\r\332t\021\330\n\003\246K\223\356\034!P\261\305t\035\346\352p\206\003n\247MMA\310\301Z<\366\246\023\0161W3\340\357\000\317T\t\301\311+\204\246L7\276\370\320*\245O\021\002\000k\024\221\270x\353\001\237\346D}\377?\265]\356+\243\v[\350\316a\340h\376<\322\266\327\016\306n\272r\t\212A\253L\216\214\205\016\241 [\360/\335\002#\\A\372\241a\261\346\346\\\251\330\312\365\016\n\341\017\016\225&;\322\\\004*\ru\316\372\a \362?8\031\247\231\030\030\267\315\023\v\343{@\227\301s\372h\212\000a\244&\231\366\nt\277\2036,\027bZ+\223W\212g\333`\264\331N\306\307\362\257(^~ b\262\247&\231\261t\341\231%\244\247\203eOt\365\271\201\273\330\350\363C^A\327F\214!\217hgf\e\320k\260n\315u~\336\371M\t\235k\230S\375\311\303\240\351\037d\273\321y\335=K\016`_\317\230\2612_\023K\036\350\v\232\323Y\310\317_\035\227%\237\v\340\023\016\243\233\025\306:\227\351\370\364x\234\231\266\367\016w\275\333-\351\210}\375x\034\262\272kRuHa\362T/F!\347B\231O`K\304\037'k$$\245h)e\363\365mT\b\317\\2\361\026\351\254\375Jl1~\r\371\267\352\2322I\341\272\376\243^Un\266E7\230[VocUJ\220N\2116D/\025f=\213\314\325\vG}\311\360\377DT\307m\261&\263\340\272\243_\020\271rG^BW\210\030l\344\0324\335\233\300\023\272\225Im\330\n\227*Yv[\006\315\330y'\a\321\373\273A\240\305F{S\246I#/\355\2425\031\031GGF\270y\n\331\004\023G@\331\000\361\343\350\264$\032\355_\210y\000\205\342\375\212q\024\004\026W:\205 \363v?\035\270L-\270=\022\323\2003\v\336\277\t\237\356\374\n\267n\003\367\342\330;\371S\326\016`B6@Njm>\240\021%\336\345\002(P\204Yn\3279l\0228\264\254\304\2528t\372h\217\347sA\314\345\245\337)]\000\b\000\021\000\032\000\035\000+\0007\000Z\000m\000\264\000\000\000\000\000\000\002\001\000\000\000\000\000\000\000\t\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002\270" }
+
+  # The below is a base64 encoded salted-SHA512 password hash.
+  let (:pw_string) { "\335\006{\3744g@\377z\204\322\r\332t\021\330\n\003\246K\223\356\034!P\261\305t\035\346\352p\206\003n\247MMA\310\301Z<\366\246\023\0161W3\340\357\000\317T\t\301\311+\204\246L7\276\370\320*\245" }
+
+  # The below is a salted-SHA512 password hash in hex.
+  let (:sha512_hash) { 'dd067bfc346740ff7a84d20dda7411d80a03a64b93ee1c2150b1c5741de6ea7086036ea74d4d41c8c15a3cf6a6130e315733e0ef00cf5409c1c92b84a64c37bef8d02aa5' }
+
+  let :plist_path do
+    '/var/db/dslocal/nodes/Default/users/jeff.plist'
+  end
+
+  let :ds_provider do
+    Puppet::Provider::NameService::DirectoryService
+  end
+
+  let :shadow_hash_data do
+    {'ShadowHashData' => [StringIO.new(binary_plist)]}
+  end
+
+  subject do
+    Puppet::Provider::NameService::DirectoryService
+  end
+
+  before :each do
+    subject.expects(:get_macosx_version_major).returns("10.7")
+  end
+
+  it 'should execute convert_binary_to_xml once when getting the password on >= 10.7' do
+    subject.expects(:convert_binary_to_xml).returns({'SALTED-SHA512' => StringIO.new(pw_string)})
+    File.expects(:exists?).with(plist_path).once.returns(true)
+    Plist.expects(:parse_xml).returns(shadow_hash_data)
+    # On Mac OS X 10.7 we first need to convert to xml when reading the password
+    subject.expects(:plutil).with('-convert', 'xml1', '-o', '/dev/stdout', plist_path)
+    subject.get_password('uid', 'jeff')
+  end
+
+  it 'should fail if a salted-SHA512 password hash is not passed in >= 10.7' do
+    expect {
+      subject.set_password('jeff', 'uid', 'badpassword')
+    }.should raise_error(RuntimeError, /OS X 10.7 requires a Salted SHA512 hash password of 136 characters./)
+  end
+
+  it 'should convert xml-to-binary and binary-to-xml when setting the pw on >= 10.7' do
+    subject.expects(:convert_binary_to_xml).returns({'SALTED-SHA512' => StringIO.new(pw_string)})
+    subject.expects(:convert_xml_to_binary).returns(binary_plist)
+    File.expects(:exists?).with(plist_path).once.returns(true)
+    Plist.expects(:parse_xml).returns(shadow_hash_data)
+    # On Mac OS X 10.7 we first need to convert to xml
+    subject.expects(:plutil).with('-convert', 'xml1', '-o', '/dev/stdout', plist_path)
+    # And again back to a binary plist or DirectoryService will complain
+    subject.expects(:plutil).with('-convert', 'binary1', plist_path)
+    Plist::Emit.expects(:save_plist).with(shadow_hash_data, plist_path)
+    subject.set_password('jeff', 'uid', sha512_hash)
+  end
+end
+
+describe '(#4855) directoryservice group resource failure' do
+  let :provider_class do
+    Puppet::Type.type(:group).provider(:directoryservice)
+  end
+
+  let :group_members do
+    ['root','jeff']
+  end
+
+  let :user_account do
+    ['root']
+  end
+
+  let :stub_resource do
+    stub('resource')
+  end
+
+  subject do
+    provider_class.new(stub_resource)
+  end
+
+  before :each do
+    @resource = stub("resource")
+    @provider = provider_class.new(@resource)
+  end
+
+  it 'should delete a group member if the user does not exist' do
+    stub_resource.stubs(:[]).with(:name).returns('fake_group')
+    stub_resource.stubs(:name).returns('fake_group')
+    subject.expects(:execute).with([:dseditgroup, '-o', 'edit', '-n', '.',
+                                   '-d', 'jeff',
+                                   'fake_group']).raises(Puppet::ExecutionFailure,
+                                   'it broke')
+    subject.expects(:execute).with([:dscl, '.', '-delete',
+                                   '/Groups/fake_group', 'GroupMembership',
+                                   'jeff'])
+    subject.remove_unwanted_members(group_members, user_account)
+  end
+end
+

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

@@ -175,6 +175,13 @@ describe provider_class do
       expect { @provider.method(:lazy_pip).call("freeze") }.to raise_error(NoMethodError)
     end
 
+    it "should output a useful error message if pip is missing" do
+      @provider.expects(:pip).with('freeze').raises(NoMethodError)
+      @provider.expects(:which).with('pip').returns(nil)
+      expect { @provider.method(:lazy_pip).call("freeze") }.
+        to raise_error(NoMethodError, 'Could not locate the pip command.')
+    end
+
   end
 
 end

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

@@ -30,16 +30,19 @@ describe provider do
       @provider.expects(:yum).with('-d', '0', '-e', '0', '-y', :install, 'mypackage')
       @provider.install
     end
+
     it 'should use :install to update' do
       @provider.expects(:install)
       @provider.update
     end
+
     it 'should be able to set version' do
       @resource.stubs(:should).with(:ensure).returns '1.2'
       @provider.expects(:yum).with('-d', '0', '-e', '0', '-y', :install, 'mypackage-1.2')
       @provider.stubs(:query).returns :ensure => '1.2'
       @provider.install
     end
+
     it 'should be able to downgrade' do
       @resource.stubs(:should).with(:ensure).returns '1.0'
       @provider.expects(:yum).with('-d', '0', '-e', '0', '-y', :downgrade, 'mypackage-1.0')
@@ -53,6 +56,7 @@ describe provider do
       @provider.expects(:yum).with('-y', :erase, 'mypackage')
       @provider.purge
     end
+
     it 'should use rpm to uninstall' do
       @provider.expects(:rpm).with('-e', 'mypackage-1-1.i386')
       @provider.uninstall
@@ -62,5 +66,45 @@ describe provider do
   it 'should be versionable' do
     provider.should be_versionable
   end
-end
 
+  describe '#latest' do
+    describe 'when latest_info is nil' do
+      before :each do
+        @provider.stubs(:latest_info).returns(nil)
+      end
+
+      it 'raises if ensure is absent and latest_info is nil' do
+        @provider.stubs(:properties).returns({:ensure => :absent})
+
+        expect { @provider.latest }.to raise_error(
+          Puppet::DevError,
+          'Tried to get latest on a missing package'
+        )
+      end
+
+      it 'returns the ensure value if the package is not already installed' do
+        @provider.stubs(:properties).returns({:ensure => '3.4.5'})
+
+        @provider.latest.should == '3.4.5'
+      end
+    end
+
+    describe 'when latest_info is populated' do
+      before :each do
+        @provider.stubs(:latest_info).returns({
+          :name     => 'mypackage',
+          :epoch    => '1',
+          :version  => '2.3.4',
+          :release  => '5',
+          :arch     => 'i686',
+          :provider => :yum,
+          :ensure   => '2.3.4-5'
+        })
+      end
+
+      it 'includes the epoch in the version string' do
+        @provider.latest.should == '1:2.3.4-5'
+      end
+    end
+  end
+end

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

@@ -88,6 +88,21 @@ describe provider_class do
       @provider.enabled?.should == :true
     end
 
+    context "when invoke-rc.d exits with 105 status" do
+      it "links count is 4" do
+        @provider.stubs(:system)
+        $CHILD_STATUS.stubs(:exitstatus).returns(105)
+        @provider.stubs(:get_start_link_count).returns(4)
+        @provider.enabled?.should == :true
+      end
+      it "links count is less than 4" do
+        @provider.stubs(:system)
+        $CHILD_STATUS.stubs(:exitstatus).returns(105)
+        @provider.stubs(:get_start_link_count).returns(3)
+        @provider.enabled?.should == :false
+      end
+    end
+
     # pick a range of non-[104.106] numbers, strings and booleans to test with.
     [-100, -1, 0, 1, 100, "foo", "", :true, :false].each do |exitstatus|
       it "should return false when invoke-rc.d exits with #{exitstatus} status" do

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

@@ -37,22 +37,21 @@ describe Puppet::Type.type(:service).provider(:launchd) do
 
   describe "when checking whether the service is enabled on OS X 10.5" do
     it "should return true in if the job plist says disabled is false" do
-      Facter.stubs(:value).with(:macosx_productversion_major).returns('10.5')
-      Facter.stubs(:value).with(:kernel).returns('Darwin')
-      Facter.stubs(:value).with(:macaddress).returns('')
-      Facter.stubs(:value).with(:arp).returns('')
+      subject.expects(:has_macosx_plist_overrides?).returns(false)
       subject.expects(:plist_from_label).with(joblabel).returns(["foo", {"Disabled" => false}])
       subject.expects(:resource).returns({:name => joblabel})
       subject.enabled?.should == :true
     end
     it "should return true in if the job plist has no disabled key" do
+      subject.expects(:has_macosx_plist_overrides?).returns(false)
       subject.expects(:resource).returns({:name => joblabel})
-      subject.stubs(:plist_from_label).returns(["foo", {}])
+      subject.expects(:plist_from_label).returns(["foo", {}])
       subject.enabled?.should == :true
     end
     it "should return false in if the job plist says disabled is true" do
+      subject.expects(:has_macosx_plist_overrides?).returns(false)
       subject.expects(:resource).returns({:name => joblabel})
-      subject.stubs(:plist_from_label).returns(["foo", {"Disabled" => true}])
+      subject.expects(:plist_from_label).returns(["foo", {"Disabled" => true}])
       subject.enabled?.should == :false
     end
   end
@@ -61,7 +60,7 @@ 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_macosx_version_major).returns("10.6")
       subject.expects(:plist_from_label).returns([joblabel, {"Disabled" => true}])
-      provider.stubs(:read_plist).returns({joblabel => {"Disabled" => false}})
+      provider.expects(:read_plist).returns({joblabel => {"Disabled" => false}})
       FileTest.expects(:file?).with(launchd_overrides).returns(true)
       subject.stubs(:resource).returns({:name => joblabel})
       subject.enabled?.should == :true
@@ -69,7 +68,7 @@ describe Puppet::Type.type(:service).provider(:launchd) do
     it "should return false if the job plist says disabled is false and the global overrides says disabled is true" do
       provider.expects(:get_macosx_version_major).returns("10.6")
       subject.expects(:plist_from_label).returns([joblabel, {"Disabled" => false}])
-      provider.stubs(:read_plist).returns({joblabel => {"Disabled" => true}})
+      provider.expects(:read_plist).returns({joblabel => {"Disabled" => true}})
       FileTest.expects(:file?).with(launchd_overrides).returns(true)
       subject.stubs(:resource).returns({:name => joblabel})
       subject.enabled?.should == :false
@@ -77,7 +76,7 @@ describe Puppet::Type.type(:service).provider(:launchd) do
     it "should return true if the job plist and the global overrides have no disabled keys" do
       provider.expects(:get_macosx_version_major).returns("10.6")
       subject.expects(:plist_from_label).returns([joblabel, {}])
-      provider.stubs(:read_plist).returns({})
+      provider.expects(:read_plist).returns({})
       FileTest.expects(:file?).with(launchd_overrides).returns(true)
       subject.stubs(:resource).returns({:name => joblabel})
       subject.enabled?.should == :true
@@ -87,61 +86,69 @@ describe Puppet::Type.type(:service).provider(:launchd) do
   describe "when starting the service" do
     it "should look for the relevant plist once" do
       subject.expects(:plist_from_label).returns([joblabel, {}]).once
-      subject.stubs(:enabled?).returns :true
-      subject.stubs(:execute).with([:launchctl, :load, joblabel])
+      subject.expects(:enabled?).returns :true
+      subject.expects(:execute).with([:launchctl, :load, joblabel])
       subject.stubs(:resource).returns({:name => joblabel})
       subject.start
     end
     it "should execute 'launchctl load' once without writing to the plist if the job is enabled" do  
-      subject.stubs(:plist_from_label).returns([joblabel, {}])
-      subject.stubs(:enabled?).returns :true
+      subject.expects(:plist_from_label).returns([joblabel, {}])
+      subject.expects(:enabled?).returns :true
       subject.expects(:execute).with([:launchctl, :load, joblabel]).once
       subject.stubs(:resource).returns({:name => joblabel})
       subject.start
     end
     it "should execute 'launchctl load' with writing to the plist once if the job is disabled" do
-      subject.stubs(:plist_from_label).returns([joblabel, {}])
-      subject.stubs(:enabled?).returns(:false)
+      subject.expects(:plist_from_label).returns([joblabel, {}])
+      subject.expects(:enabled?).returns(:false)
       subject.stubs(:resource).returns({:name => joblabel})
       subject.expects(:execute).with([:launchctl, :load, "-w", joblabel]).once
       subject.start
     end
     it "should disable the job once if the job is disabled and should be disabled at boot" do
-      subject.stubs(:plist_from_label).returns([joblabel, {"Disabled" => true}])
-      subject.stubs(:enabled?).returns :false
-      subject.stubs(:execute).with([:launchctl, :load, "-w", joblabel])
+      subject.expects(:plist_from_label).returns([joblabel, {"Disabled" => true}])
+      subject.expects(:enabled?).returns :false
+      subject.expects(:execute).with([:launchctl, :load, "-w", joblabel])
       subject.stubs(:resource).returns({:name => joblabel, :enable => :false})
       subject.expects(:disable).once
       subject.start
     end
+    it "(#2773) should execute 'launchctl load -w' if the job is enabled but stopped" do
+      subject.expects(:plist_from_label).returns([joblabel, {}])
+      subject.expects(:enabled?).returns(:true)
+      subject.expects(:status).returns(:stopped)
+      subject.expects(:resource).returns({:name => joblabel}).twice
+      subject.expects(:execute).with([:launchctl, :load, '-w', joblabel])
+      subject.start
+    end
   end
 
   describe "when stopping the service" do
     it "should look for the relevant plist once" do
       subject.expects(:plist_from_label).returns([joblabel, {}]).once
-      subject.stubs(:enabled?).returns :true
-      subject.stubs(:execute).with([:launchctl, :unload, '-w', joblabel])
+      subject.expects(:enabled?).returns :true
+      subject.expects(:execute).with([:launchctl, :unload, '-w', joblabel])
       subject.stubs(:resource).returns({:name => joblabel})
       subject.stop
     end
     it "should execute 'launchctl unload' once without writing to the plist if the job is disabled" do
-      subject.stubs(:plist_from_label).returns([joblabel, {}])
-      subject.stubs(:enabled?).returns :false
+      subject.expects(:plist_from_label).returns([joblabel, {}])
+      subject.expects(:enabled?).returns :false
       subject.expects(:execute).with([:launchctl, :unload, joblabel]).once
       subject.stubs(:resource).returns({:name => joblabel})
       subject.stop
     end
     it "should execute 'launchctl unload' with writing to the plist once if the job is enabled" do
-      subject.stubs(:plist_from_label).returns([joblabel, {}])
-      subject.stubs(:enabled?).returns :true
+      subject.expects(:plist_from_label).returns([joblabel, {}])
+      subject.expects(:enabled?).returns :true
       subject.expects(:execute).with([:launchctl, :unload, '-w', joblabel]).once
       subject.stubs(:resource).returns({:name => joblabel})
       subject.stop
     end
     it "should enable the job once if the job is enabled and should be enabled at boot" do
-      subject.stubs(:plist_from_label).returns([joblabel, {"Disabled" => false}])
-      subject.stubs(:enabled?).returns :true
-      subject.stubs(:execute).with([:launchctl, :unload, "-w", joblabel])
+      subject.expects(:plist_from_label).returns([joblabel, {"Disabled" => false}])
+      subject.expects(:enabled?).returns :true
+      subject.expects(:execute).with([:launchctl, :unload, "-w", joblabel])
       subject.stubs(:resource).returns({:name => joblabel, :enable => :true})
       subject.expects(:enable).once
       subject.stop
@@ -151,15 +158,15 @@ describe Puppet::Type.type(:service).provider(:launchd) do
   describe "when enabling the service" do
     it "should look for the relevant plist once" do   ### Do we need this test?  Differentiating it?
       subject.expects(:plist_from_label).returns([joblabel, {}]).once
-      subject.stubs(:enabled?).returns :false
-      subject.stubs(:execute).with([:launchctl, :unload, joblabel])
+      subject.expects(:enabled?).returns :false
+      subject.expects(:execute).with([:launchctl, :unload, joblabel])
       subject.stubs(:resource).returns({:name => joblabel, :enable => :true})
       subject.stop
     end
     it "should check if the job is enabled once" do
-      subject.stubs(:plist_from_label).returns([joblabel, {}]).once
+      subject.expects(:plist_from_label).returns([joblabel, {}]).once
       subject.expects(:enabled?).once
-      subject.stubs(:execute).with([:launchctl, :unload, joblabel])
+      subject.expects(:execute).with([:launchctl, :unload, joblabel])
       subject.stubs(:resource).returns({:name => joblabel, :enable => :true})
       subject.stop
     end
@@ -168,8 +175,8 @@ describe Puppet::Type.type(:service).provider(:launchd) do
   describe "when disabling the service" do
     it "should look for the relevant plist once" do
       subject.expects(:plist_from_label).returns([joblabel, {}]).once
-      subject.stubs(:enabled?).returns :true
-      subject.stubs(:execute).with([:launchctl, :unload, '-w', joblabel])
+      subject.expects(:enabled?).returns :true
+      subject.expects(:execute).with([:launchctl, :unload, '-w', joblabel])
       subject.stubs(:resource).returns({:name => joblabel, :enable => :false})
       subject.stop
     end
@@ -177,8 +184,8 @@ describe Puppet::Type.type(:service).provider(:launchd) do
 
   describe "when enabling the service on OS X 10.6" do
     it "should write to the global launchd overrides file once" do
-      provider.stubs(:get_macosx_version_major).returns("10.6")
-      provider.stubs(:read_plist).returns({})
+      provider.expects(:get_macosx_version_major).returns("10.6")
+      provider.expects(:read_plist).returns({})
       Plist::Emit.expects(:save_plist).once
       subject.stubs(:resource).returns({:name => joblabel, :enable => :true})
       subject.enable
@@ -200,15 +207,13 @@ describe Puppet::Type.type(:service).provider(:launchd) do
       provider.instance_variable_set(:@macosx_version_major, nil)
     end
     it "should display a deprecation warning" do
-      Facter.stubs(:value).with(:macosx_productversion_major).returns(nil)
-      Facter.stubs(:value).with(:kernel).returns('Darwin')
-      Facter.stubs(:value).with(:macosx_productversion).returns('10.5.8')
+      Facter.expects(:value).with(:macosx_productversion_major).returns(nil)
+      Facter.expects(:value).with(:macosx_productversion).returns('10.5.8')
+      Facter.expects(:loadfacts)
       Puppet::Util::Warnings.expects(:maybe_log)
-      provider.stubs(:read_plist).returns({joblabel => {"Disabled" => false}})
-      subject.stubs(:plist_from_label).returns([joblabel, {"Disabled" => false}])
-      subject.stubs(:enabled?).returns :false
-      subject.stubs(:execute).with([:launchctl, :load, '-w', joblabel]).returns('')
-      File.stubs(:open).returns('')
+      subject.expects(:plist_from_label).returns([joblabel, {"Disabled" => false}])
+      subject.expects(:enabled?).returns :false
+      File.expects(:open).returns('')
       subject.stubs(:resource).returns({:name => joblabel, :enable => :true})
       subject.enable
     end