[Pkg-puppet-devel] [SCM] Packaging of Facter for debian branch, experimental_upstream, updated. 1.5.9-54-g5a4eeed

[Matt Robinson]

The following commit has been merged in the experimental_upstream branch:
commit 8002c240dcd42d3fe0e70b99859c76067f298cef
Author: Matt Robinson <matt at puppetlabs.com>
Date:   Fri May 20 11:21:07 2011 -0700

    (#7507) Fix 1.9.2 test failure
    
    Dir.glob returns an array, but a test was stubbing it to return a
    string.  In Ruby 1.8.7 if you call enumerable methods (each, collect,
    etc) on a string, the string is split on \n first.  This meant the poor
    stubbing didn't affect 1.8.7, but 1.9.2 is more strict and won't
    automatically convert when you call enumerable methods on strings.
    
    Paired-with: Josh Cooper <josh at puppetlabs.com>

diff --git a/spec/unit/physicalprocessorcount_spec.rb b/spec/unit/physicalprocessorcount_spec.rb
index 260788b..e1f7c60 100644
--- a/spec/unit/physicalprocessorcount_spec.rb
+++ b/spec/unit/physicalprocessorcount_spec.rb
@@ -14,7 +14,7 @@ describe "Physical processor count facts" do
     it "should return one physical CPU" do
         Facter.fact(:kernel).stubs(:value).returns("Linux")
         File.stubs(:exists?).with('/sys/devices/system/cpu').returns(true)
-        Dir.stubs(:glob).with("/sys/devices/system/cpu/cpu*/topology/physical_package_id").returns("/sys/devices/system/cpu/cpu0/topology/physical_package_id")
+        Dir.stubs(:glob).with("/sys/devices/system/cpu/cpu*/topology/physical_package_id").returns(["/sys/devices/system/cpu/cpu0/topology/physical_package_id"])
         Facter::Util::Resolution.stubs(:exec).with("cat /sys/devices/system/cpu/cpu0/topology/physical_package_id").returns("0")
 
         Facter.fact(:physicalprocessorcount).value.should == 1

-- 
Packaging of Facter for debian