summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Robinson <matt@puppetlabs.com>2011-05-20 11:24:28 -0700
committerMatt Robinson <matt@puppetlabs.com>2011-05-20 11:24:28 -0700
commit0466baabc2b0f7f6858e707ff22d097594f80d00 (patch)
tree20fcca85f97a8165e7ada1f1d301b0439121970c
parent063582222f83bd713699c86c825ec1e628a57473 (diff)
parent8002c240dcd42d3fe0e70b99859c76067f298cef (diff)
downloadfacter-0466baabc2b0f7f6858e707ff22d097594f80d00.tar.gz
facter-0466baabc2b0f7f6858e707ff22d097594f80d00.tar.xz
facter-0466baabc2b0f7f6858e707ff22d097594f80d00.zip
Merge branch 'ticket/next/7507-ruby19_fix' into next
* ticket/next/7507-ruby19_fix: (#7507) Fix 1.9.2 test failure
-rw-r--r--spec/unit/physicalprocessorcount_spec.rb2
1 files changed, 1 insertions, 1 deletions
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