From 8002c240dcd42d3fe0e70b99859c76067f298cef Mon Sep 17 00:00:00 2001 From: Matt Robinson Date: Fri, 20 May 2011 11:21:07 -0700 Subject: (#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 --- spec/unit/physicalprocessorcount_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit