[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.5-303-gfcfa26a

[Jacob Helwig]

The following commit has been merged in the upstream branch:
commit bd5517dd9cd8e10f488713d9654957746e687378
Author: Paul Berry <paul at puppetlabs.com>
Date:   Mon Mar 7 17:56:41 2011 -0800

    Adjust Darwin mount provider tests to pass on Linux
    
    mount, and umount are located under /bin, instead of /sbin on Linux, so we
    adjust the ExecutionStub to accept either location.
    
    Paired-with: Jacob Helwig <jacob at puppetlabs.com>

diff --git a/spec/integration/provider/mount_spec.rb b/spec/integration/provider/mount_spec.rb
index 69a9eeb..c28707d 100644
--- a/spec/integration/provider/mount_spec.rb
+++ b/spec/integration/provider/mount_spec.rb
@@ -14,7 +14,7 @@ describe "mount provider (integration)" do
     Facter.stubs(:value).with(:operatingsystem).returns('Darwin')
     Puppet::Util::ExecutionStub.set do |command, options|
       case command[0]
-      when '/sbin/mount'
+      when %r{/s?bin/mount}
         if command.length == 1
           if @mounted
             "/dev/disk1s1 on /Volumes/foo_disk (msdos, local)\n"
@@ -31,7 +31,7 @@ describe "mount provider (integration)" do
           @mounted = true
           ''
         end
-      when '/sbin/umount'
+      when %r{/s?bin/umount}
         fail "unexpected umount" unless @umount_permitted
         command.length.should == 2
         command[1].should == '/Volumes/foo_disk'

-- 
Puppet packaging for Debian