facter 1.7.3 → 1.7.4.rc1

data/spec/fixtures/hpux/machinfo/superdome-server-SD32B

@@ -0,0 +1,53 @@
+CPU info:
+   Number of CPUs = 8
+   Number of enabled CPUs = 2
+   Number of enabled sockets = 2
+   Cores per socket = 2
+   Clock speed = 1598 MHz
+   Bus speed   = 533 MT/s
+   CPUID registers
+      vendor information =       "GenuineIntel"
+      processor serial number =  0x0000000000000000
+      processor version info =   0x0000000020000704
+         architecture revision:       0
+         processor family:           32   Intel(R) Itanium 2 9000 series
+         processor model:             1   Intel(R) Itanium 2 9000 series
+   Bus features
+      implemented =  0xbdf0000020000000
+      selected    =  0x0020000000000000
+         Exclusive Bus Cache Line Replacement Enabled
+         processor revision:          7   Stepping C2
+         largest CPUID reg:           4
+      processor capabilities =   0x0000000000000005
+                      implements long branch:  1
+        implements 16-byte atomic operations:  1
+
+Cache info (per core):
+   L1 Instruction: size =   16 KB, associativity = 4
+   L1 Data:        size =   16 KB, associativity = 4
+   L2 Instruction: size = 1024 KB, associativity = 8
+   L2 Data:        size =  256 KB, associativity = 8
+   L3 Unified:     size = 12288 KB, associativity = 12
+
+Memory = 32700 MB (31.933594 GB)
+
+Firmware info:
+   Firmware revision = 9.66
+   FP SWA driver revision: 1.18
+   IPMI is supported on this system.
+   ERROR: Unable to obtain manageability firmware revision info.
+
+Platform info:
+   model string =          "ia64 hp superdome server SD32B"
+   machine id number =     STRING_WITH_DASHES
+   machine serial number = STRING
+
+OS info:
+   sysname  = HP-UX
+   nodename = HOSTNAME
+   release  = B.11.23
+   version  = U (unlimited-user license)
+   machine  = ia64
+   idnumber = NUMBER
+   vmunix _release_version:               
+@(#) $Revision: vmunix:    B11.23_LR FLAVOR=perf Fri Aug 29 22:35:38 PDT 2003 $

data/spec/fixtures/hpux/machinfo/superdome2-16s

@@ -0,0 +1,31 @@
+CPU info:
+   Intel(R)  Itanium(R)  Processor 9340 (1.6 GHz, 15 MB)
+   4 cores, 8 logical processors per socket
+   4.79 GT/s QPI, CPU version E0
+          Active processor count:
+          2 sockets
+          6 cores (3 per socket)
+          12 logical processors (6 per socket)
+          LCPU attribute is enabled
+
+Memory: 14332 MB (14 GB)
+
+Firmware info:
+   Firmware revision:  004.044.000
+   FP SWA driver revision: 1.18
+   IPMI is supported on this system.
+   BMC firmware revision: 2.53
+
+Platform info:
+   Model:                  "ia64 hp Superdome2 16s"
+   Machine ID number:      STRING_WITH_DASHES
+   Machine serial number:  STRING
+
+OS info:
+   Nodename:  HOSTNAME
+   Release:   HP-UX B.11.31
+   Version:   U (unlimited-user license)
+   Machine:   ia64
+   ID Number: NUMBER
+   vmunix _release_version:
+@(#) $Revision: vmunix:    B.11.31_LR FLAVOR=perf

data/spec/fixtures/processorcount/solaris-psrinfo

@@ -0,0 +1,24 @@
+0       on-line   since 10/01/2012 21:05:55
+1       on-line   since 10/01/2012 21:06:00
+2       on-line   since 10/01/2012 21:06:00
+3       on-line   since 10/01/2012 21:06:00
+4       on-line   since 10/01/2012 21:06:00
+5       on-line   since 10/01/2012 21:06:00
+6       on-line   since 10/01/2012 21:06:00
+7       on-line   since 10/01/2012 21:06:00
+8       on-line   since 10/01/2012 21:06:00
+9       on-line   since 10/01/2012 21:06:00
+10      on-line   since 10/01/2012 21:06:00
+11      on-line   since 10/01/2012 21:06:00
+12      on-line   since 10/01/2012 21:06:01
+13      on-line   since 10/01/2012 21:06:01
+14      on-line   since 10/01/2012 21:06:01
+15      on-line   since 10/01/2012 21:06:01
+16      on-line   since 10/01/2012 21:06:01
+17      on-line   since 10/01/2012 21:06:01
+18      on-line   since 10/01/2012 21:06:01
+19      on-line   since 10/01/2012 21:06:01
+20      on-line   since 10/01/2012 21:06:01
+21      on-line   since 10/01/2012 21:06:01
+22      on-line   since 10/01/2012 21:06:01
+23      on-line   since 10/01/2012 21:06:01

data/spec/lib/facter_spec/cpuinfo.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+module FacterSpec::Cpuinfo
+  def cpuinfo_fixtures(filename)
+    fixtures('cpuinfo', filename)
+  end
+
+  def cpuinfo_fixture_read(filename)
+    File.read(cpuinfo_fixtures(filename))
+  end
+
+  def cpuinfo_fixture_readlines(filename)
+    cpuinfo_fixture_read(filename).split(/\n/)
+  end
+end

data/spec/unit/architecture_spec.rb

@@ -1,6 +1,7 @@
 #! /usr/bin/env ruby
 
 require 'spec_helper'
+require 'facter/util/architecture'
 
 describe "Architecture fact" do
 
@@ -52,4 +53,11 @@ describe "Architecture fact" do
     end
   end
 
+  it "(#16081) should be PowerPC_POWER7 if os is AIX" do
+    Facter.fact(:kernel).stubs(:value).returns("AIX")
+    Facter::Util::Architecture.stubs(:lsattr).returns("type PowerPC_POWER7 Processor type False")
+    Facter.fact(:hardwaremodel).stubs(:value).returns("IBM,8233-E8B")
+    Facter.fact(:architecture).value.should == "PowerPC_POWER7"
+  end
+
 end

data/spec/unit/ec2_spec.rb

@@ -136,8 +136,8 @@ describe "ec2 facts" do
     end
 
     it "should return nil if open fails" do
+      Facter.stubs(:warn) # do not pollute test output
       Facter.expects(:warn).with('Could not retrieve ec2 metadata: host unreachable')
-      Facter::Util::Resolution.any_instance.stubs(:warn) # do not pollute test output
 
       Object.any_instance.expects(:open).
         with("#{api_prefix}/2008-02-01/meta-data/").

data/spec/unit/memory_spec.rb

@@ -154,7 +154,21 @@ device maj,min total free
 /dev/hd6 10, 2 512MB 508MB
 SWAP
 
-      Facter::Util::Resolution.stubs(:exec).with('swap -l').returns(swapusage)
+      Facter::Util::Resolution.stubs(:exec).with('swap -l 2>/dev/null').returns(swapusage)
+
+      svmon = <<SVMON
+Unit: KB
+--------------------------------------------------------------------------------------
+               size       inuse        free         pin     virtual  available   mmode
+memory     32768000     9948408    22819592     2432080     4448928   27231828     Ded
+pg space   34078720       15000
+
+               work        pers        clnt       other
+pin         1478228           0           0      953852
+in use      4448928           0     5499480
+SVMON
+
+      Facter::Util::Resolution.stubs(:exec).with('/usr/bin/svmon -O unit=KB').returns(svmon)
 
       Facter.collection.internal_loader.load(:memory)
     end
@@ -190,6 +204,15 @@ SWAP
         Facter.fact(:swapfree_mb).value.should == "508.00"
       end
     end
+
+    it "should return the current memory free in MB" do
+      Facter.fact(:memoryfree_mb).value.should == "22284.76"
+    end
+
+    it "should return the current memory size in MB" do
+      Facter.fact(:memorysize_mb).value.should == "32000.00"
+    end
+
   end
 
 
@@ -264,7 +287,7 @@ VMSTAT
 swapfile             dev  swaplo blocks   free
 /dev/swap           4294967295,4294967295     16 2097136 2097136
 SWAP
-        Facter::Util::Resolution.stubs(:exec).with('/usr/sbin/swap -l').returns sample_swap_line
+        Facter::Util::Resolution.stubs(:exec).with('/usr/sbin/swap -l 2>/dev/null').returns sample_swap_line
 
         Facter.collection.internal_loader.load(:memory)
       end
@@ -293,7 +316,7 @@ swapfile             dev  swaplo blocks   free
 /dev/swap           4294967295,4294967295     16 2097136 2097136
 /dev/swap2          4294967295,4294967295     16 2097136 2097136
 SWAP
-        Facter::Util::Resolution.stubs(:exec).with('/usr/sbin/swap -l').returns sample_swap_line
+        Facter::Util::Resolution.stubs(:exec).with('/usr/sbin/swap -l 2>/dev/null').returns sample_swap_line
         Facter.collection.internal_loader.load(:memory)
       end
 
@@ -316,7 +339,7 @@ SWAP
 
     describe "when no swap exists" do
       before(:each) do
-        Facter::Util::Resolution.stubs(:exec).with('/usr/sbin/swap -l').returns ""
+        Facter::Util::Resolution.stubs(:exec).with('/usr/sbin/swap -l 2>/dev/null').returns ""
 
         Facter.collection.internal_loader.load(:memory)
       end

data/spec/unit/operatingsystemrelease_spec.rb

@@ -154,14 +154,14 @@ describe "Operating System Release fact" do
   end
 
   context "Ubuntu" do
-    let(:issue) { "Ubuntu 10.04.4 LTS \\n \\l\n\n" }
+    let(:lsbrelease) { 'DISTRIB_ID=Ubuntu\nDISTRIB_RELEASE=10.04\nDISTRIB_CODENAME=lucid\nDISTRIB_DESCRIPTION="Ubuntu 10.04.4 LTS"'}
     before :each do
       Facter.fact(:kernel).stubs(:value).returns("Linux")
       Facter.fact(:operatingsystem).stubs(:value).returns("Ubuntu")
     end
 
     it "Returns only the major and minor version (not patch version)" do
-      Facter::Util::FileRead.stubs(:read).with("/etc/issue").returns(issue)
+      Facter::Util::FileRead.stubs(:read).with("/etc/lsb-release").returns(lsbrelease)
       Facter.fact(:operatingsystemrelease).value.should == "10.04"
     end
   end

data/spec/unit/processor_spec.rb

@@ -2,10 +2,7 @@
 
 require 'facter/util/processor'
 require 'spec_helper'
-
-def cpuinfo_fixture(filename)
-  File.open(fixtures('cpuinfo', filename)).readlines
-end
+require 'facter_spec/cpuinfo'
 
 describe "Processor facts" do
   describe "on Windows" do
@@ -68,111 +65,122 @@ describe "Processor facts" do
     end
   end
 
-  describe "on Solaris" do
-    before :each do
-      Facter.collection.internal_loader.load(:processor)
-      Facter.fact(:kernel).stubs(:value).returns(:sunos)
-      Facter.stubs(:value).with(:kernelrelease).returns("5.10")
-    end
+  describe "on Linux" do
+    include FacterSpec::Cpuinfo
 
-    it "should detect the correct processor count on x86_64" do
-      fixture_data = File.read(fixtures('processorcount','solaris-x86_64-kstat-cpu-info'))
-      Facter::Util::Resolution.expects(:exec).with("/usr/bin/kstat cpu_info").returns(fixture_data)
-      Facter.fact(:processorcount).value.should == 8
-    end
+    shared_context 'Linux processor stubs' do
+      before :each do
+        Facter.collection.internal_loader.load(:processor)
 
-    it "should detect the correct processor count on sparc" do
-      fixture_data = File.read(fixtures('processorcount','solaris-sparc-kstat-cpu-info'))
-      Facter::Util::Resolution.expects(:exec).with("/usr/bin/kstat cpu_info").returns(fixture_data)
-      Facter.fact(:processorcount).value.should == 8
+        Facter.fact(:kernel).stubs(:value).returns 'Linux'
+        Facter.fact(:operatingsystem).stubs(:value).returns 'Linux'
+        File.stubs(:exists?).with("/proc/cpuinfo").returns(true)
+      end
     end
-  end
 
-  describe "on Unixes" do
-    before :each do
-      Facter.collection.internal_loader.load(:processor)
-    end
+    shared_examples_for 'a /proc/cpuinfo based processor fact' do |processor_fact|
+      include_context 'Linux processor stubs'
 
-    it "should be 1 in SPARC fixture" do
-      Facter.fact(:kernel).stubs(:value).returns("Linux")
-      Facter.fact(:operatingsystem).stubs(:value).returns("Linux")
-      Facter.fact(:architecture).stubs(:value).returns("sparc")
-      File.stubs(:exists?).with("/proc/cpuinfo").returns(true)
-      File.stubs(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture("sparc"))
+      it "should be 1 in SPARC fixture" do
+        Facter.fact(:architecture).stubs(:value).returns("sparc")
+        File.stubs(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture_readlines("sparc"))
 
-      Facter.fact(:processorcount).value.should == "1"
-    end
+        Facter.fact(processor_fact).value.should == "1"
+      end
 
-    it "should be 2 in ppc64 fixture on Linux" do
-      Facter.fact(:kernel).stubs(:value).returns("Linux")
-      Facter.fact(:architecture).stubs(:value).returns("ppc64")
-      File.stubs(:exists?).with("/proc/cpuinfo").returns(true)
-      File.stubs(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture("ppc64"))
+      it "should be 2 in ppc64 fixture on Linux" do
+        Facter.fact(:architecture).stubs(:value).returns("ppc64")
+        File.stubs(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture_readlines("ppc64"))
 
-      Facter.fact(:processorcount).value.should == "2"
-    end
+        Facter.fact(processor_fact).value.should == "2"
+      end
 
-    it "should be 2 in panda-armel fixture on Linux" do
-      Facter.fact(:kernel).stubs(:value).returns("Linux")
-      Facter.fact(:architecture).stubs(:value).returns("arm")
-      File.stubs(:exists?).with("/proc/cpuinfo").returns(true)
-      File.stubs(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture("panda-armel"))
+      it "should be 2 in panda-armel fixture on Linux" do
+        Facter.fact(:architecture).stubs(:value).returns("arm")
+        File.stubs(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture_readlines("panda-armel"))
 
-      Facter.fact(:processorcount).value.should == "2"
-    end
+        Facter.fact(processor_fact).value.should == "2"
+      end
 
-    it "should be 1 in bbg3-armel fixture on Linux" do
-      Facter.fact(:kernel).stubs(:value).returns("Linux")
-      Facter.fact(:architecture).stubs(:value).returns("arm")
-      File.stubs(:exists?).with("/proc/cpuinfo").returns(true)
-      File.stubs(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture("bbg3-armel"))
+      it "should be 1 in bbg3-armel fixture on Linux" do
+        Facter.fact(:architecture).stubs(:value).returns("arm")
+        File.stubs(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture_readlines("bbg3-armel"))
 
-      Facter.fact(:processorcount).value.should == "1"
-    end
+        Facter.fact(processor_fact).value.should == "1"
+      end
 
-    it "should be 1 in beaglexm-armel fixture on Linux" do
-      Facter.fact(:kernel).stubs(:value).returns("Linux")
-      Facter.fact(:architecture).stubs(:value).returns("arm")
-      File.stubs(:exists?).with("/proc/cpuinfo").returns(true)
-      File.stubs(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture("beaglexm-armel"))
+      it "should be 1 in beaglexm-armel fixture on Linux" do
+        Facter.fact(:architecture).stubs(:value).returns("arm")
+        File.stubs(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture_readlines("beaglexm-armel"))
 
-      Facter.fact(:processorcount).value.should == "1"
-    end
+        Facter.fact(processor_fact).value.should == "1"
+      end
+
+      it "should be 1 in amd64solo fixture on Linux" do
+        Facter.fact(:architecture).stubs(:value).returns("amd64")
+        File.stubs(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture_readlines("amd64solo"))
+
+        Facter.fact(processor_fact).value.should == "1"
+      end
 
-    it "should be 1 in amd64solo fixture on Linux" do
-      Facter.fact(:kernel).stubs(:value).returns("Linux")
-      Facter.fact(:architecture).stubs(:value).returns("amd64")
-      File.stubs(:exists?).with("/proc/cpuinfo").returns(true)
-      File.stubs(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture("amd64solo"))
+      it "should be 2 in amd64dual fixture on Linux" do
+        Facter.fact(:architecture).stubs(:value).returns("amd64")
+        File.stubs(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture_readlines("amd64dual"))
 
-      Facter.fact(:processorcount).value.should == "1"
+        Facter.fact(processor_fact).value.should == "2"
+      end
+
+      it "should be 3 in amd64tri fixture on Linux" do
+        Facter.fact(:architecture).stubs(:value).returns("amd64")
+        File.stubs(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture_readlines("amd64tri"))
+
+        Facter.fact(processor_fact).value.should == "3"
+      end
+
+      it "should be 4 in amd64quad fixture on Linux" do
+        Facter.fact(:architecture).stubs(:value).returns("amd64")
+        File.stubs(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture_readlines("amd64quad"))
+
+        Facter.fact(processor_fact).value.should == "4"
+      end
     end
 
-    it "should be 2 in amd64dual fixture on Linux" do
-      Facter.fact(:kernel).stubs(:value).returns("Linux")
-      Facter.fact(:architecture).stubs(:value).returns("amd64")
-      File.stubs(:exists?).with("/proc/cpuinfo").returns(true)
-      File.stubs(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture("amd64dual"))
+    it_behaves_like 'a /proc/cpuinfo based processor fact', :processorcount
 
-      Facter.fact(:processorcount).value.should == "2"
+    def sysfs_cpu_stubs(count)
+      (0...count).map { |index| "/sys/devices/system/cpu/cpu#{index}" }
     end
 
-    it "should be 3 in amd64tri fixture on Linux" do
-      Facter.fact(:kernel).stubs(:value).returns("Linux")
-      Facter.fact(:architecture).stubs(:value).returns("amd64")
-      File.stubs(:exists?).with("/proc/cpuinfo").returns(true)
-      File.stubs(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture("amd64tri"))
+    describe 'when /proc/cpuinfo returns 0 processors (#2945)' do
+      include_context 'Linux processor stubs'
+
+      before do
+        File.stubs(:readlines).with("/proc/cpuinfo").returns([])
+        File.stubs(:exists?).with("/sys/devices/system/cpu").returns(true)
+      end
+
+      it "should be 2 via sysfs when cpu0 and cpu1 are present" do
+        Dir.stubs(:glob).with("/sys/devices/system/cpu/cpu[0-9]*").returns(
+          sysfs_cpu_stubs(2)
+        )
+
+        Facter.fact(:processorcount).value.should == "2"
+      end
 
-      Facter.fact(:processorcount).value.should == "3"
+      it "should be 16 via sysfs when cpu0 through cpu15 are present" do
+        Dir.stubs(:glob).with("/sys/devices/system/cpu/cpu[0-9]*").returns(
+          sysfs_cpu_stubs(16)
+        )
+
+        Facter.fact(:processorcount).value.should == "16"
+      end
     end
+  end
 
-    it "should be 4 in amd64quad fixture on Linux" do
-      Facter.fact(:kernel).stubs(:value).returns("Linux")
-      Facter.fact(:architecture).stubs(:value).returns("amd64")
-      File.stubs(:exists?).with("/proc/cpuinfo").returns(true)
-      File.stubs(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture("amd64quad"))
 
-      Facter.fact(:processorcount).value.should == "4"
+  describe "on Unixes" do
+    before :each do
+      Facter.collection.internal_loader.load(:processor)
     end
 
     it "should be 2 on dual-processor Darwin box" do
@@ -203,90 +211,49 @@ describe "Processor facts" do
       Facter.fact(:processor).value.should == "SomeVendor CPU 3GHz"
     end
 
-
     it "should be 2 on dual-processor DragonFly box" do
       Facter.fact(:kernel).stubs(:value).returns("DragonFly")
       Facter::Util::Resolution.stubs(:exec).with("sysctl -n hw.ncpu").returns('2')
 
       Facter.fact(:processorcount).value.should == "2"
     end
+  end
 
-    it "should be 2 via sysfs when cpu0 and cpu1 are present" do
-      Facter.fact(:kernel).stubs(:value).returns("Linux")
-      File.stubs(:exists?).with('/sys/devices/system/cpu').returns(true)
-      ## sysfs method is only used if cpuinfo method returned no processors
-      File.stubs(:exists?).with("/proc/cpuinfo").returns(true)
-      File.stubs(:readlines).with("/proc/cpuinfo").returns([])
-      Dir.stubs(:glob).with("/sys/devices/system/cpu/cpu[0-9]*").returns(%w{
-        /sys/devices/system/cpu/cpu0
-        /sys/devices/system/cpu/cpu1
-      })
-
-      Facter.fact(:processorcount).value.should == "2"
+  describe "on solaris" do
+    before :each do
+      Facter::Util::Processor.stubs(:kernel_fact_value).returns :sunos
+      Facter.fact(:kernel).stubs(:value).returns(:sunos)
+      Facter.collection.internal_loader.load(:processor)
     end
 
-    it "should be 16 via sysfs when cpu0 through cpu15 are present" do
-      Facter.fact(:kernel).stubs(:value).returns("Linux")
-      File.stubs(:exists?).with('/sys/devices/system/cpu').returns(true)
-      ## sysfs method is only used if cpuinfo method returned no processors
-      File.stubs(:exists?).with("/proc/cpuinfo").returns(true)
-      File.stubs(:readlines).with("/proc/cpuinfo").returns([])
-      Dir.stubs(:glob).with("/sys/devices/system/cpu/cpu[0-9]*").returns(%w{
-        /sys/devices/system/cpu/cpu0
-        /sys/devices/system/cpu/cpu1
-        /sys/devices/system/cpu/cpu2
-        /sys/devices/system/cpu/cpu3
-        /sys/devices/system/cpu/cpu4
-        /sys/devices/system/cpu/cpu5
-        /sys/devices/system/cpu/cpu6
-        /sys/devices/system/cpu/cpu7
-        /sys/devices/system/cpu/cpu8
-        /sys/devices/system/cpu/cpu9
-        /sys/devices/system/cpu/cpu10
-        /sys/devices/system/cpu/cpu11
-        /sys/devices/system/cpu/cpu12
-        /sys/devices/system/cpu/cpu13
-        /sys/devices/system/cpu/cpu14
-        /sys/devices/system/cpu/cpu15
-      })
-
-      Facter.fact(:processorcount).value.should == "16"
+    before :all do
+      @fixture_kstat_sparc  = File.read(fixtures('processorcount','solaris-sparc-kstat-cpu-info'))
+      @fixture_kstat_x86_64 = File.read(fixtures('processorcount','solaris-x86_64-kstat-cpu-info'))
     end
 
-    describe "on solaris" do
-      before :all do
-        @fixture_kstat_sparc  = File.read(fixtures('processorcount','solaris-sparc-kstat-cpu-info'))
-        @fixture_kstat_x86_64 = File.read(fixtures('processorcount','solaris-x86_64-kstat-cpu-info'))
-      end
-
-      let(:psrinfo) do
-        "0       on-line   since 10/16/2012 14:06:12\n" +
-        "1       on-line   since 10/16/2012 14:06:14\n"
-      end
-
-      let(:kstat_sparc) { @fixture_kstat_sparc }
-      let(:kstat_x86_64) { @fixture_kstat_x86_64 }
+    let(:kstat_sparc) { @fixture_kstat_sparc }
+    let(:kstat_x86_64) { @fixture_kstat_x86_64 }
 
-      %w{ 5.8 5.9 5.10 5.11 }.each do |release|
-        %w{ sparc x86_64 }.each do |arch|
-          it "uses kstat on release #{release} (#{arch})" do
-            Facter.fact(:kernel).stubs(:value).returns(:sunos)
-            Facter.stubs(:value).with(:kernelrelease).returns(release)
+    %w{ 5.8 5.9 5.10 5.11 }.each do |release|
+      %w{ sparc x86_64 }.each do |arch|
+        it "uses kstat on release #{release} (#{arch})" do
+          Facter.stubs(:value).with(:kernelrelease).returns(release)
 
-            Facter::Util::Resolution.expects(:exec).with("/usr/bin/kstat cpu_info").returns(self.send("kstat_#{arch}".intern))
-            Facter.fact(:processorcount).value.should == 8
-          end
+          Facter::Util::Resolution.expects(:exec).with("/usr/sbin/psrinfo").never
+          Facter::Util::Resolution.expects(:exec).with("/usr/bin/kstat cpu_info").returns(self.send("kstat_#{arch}".intern))
+          Facter.fact(:processorcount).value.should == 8
         end
       end
+    end
 
-      %w{ 5.5.1 5.6 5.7 }.each do |release|
-        it "uses psrinfo on release #{release}" do
-          Facter.fact(:kernel).stubs(:value).returns(:sunos)
-          Facter.stubs(:value).with(:kernelrelease).returns(release)
+    %w{ 5.5.1 5.6 5.7 }.each do |release|
+      it "uses psrinfo on release #{release}" do
+        Facter.stubs(:value).with(:kernelrelease).returns(release)
 
-          Facter::Util::Resolution.expects(:exec).with("/usr/sbin/psrinfo").returns(psrinfo)
-          Facter.fact(:physicalprocessorcount).value.should == "2"
-        end
+        fixture_data = File.read(fixtures('processorcount','solaris-psrinfo'))
+        Facter::Util::Resolution.expects(:exec).with("/usr/bin/kstat cpu_info").never
+        Facter::Util::Resolution.expects(:exec).with("/usr/sbin/psrinfo").returns(fixture_data)
+        Facter.fact(:processorcount).value.should == 24
       end
     end
   end
@@ -333,6 +300,8 @@ describe "processorX facts" do
       examples << [File.read(fixtures('hpux','machinfo','ia64-rx6600')), "Intel(R) Itanium 2 9100 series processor (1.59 GHz, 18 MB)"]
       examples << [File.read(fixtures('hpux','machinfo','ia64-rx8640')), "Intel(R) Itanium 2 9100 series"]
       examples << [File.read(fixtures('hpux','machinfo','hppa-rp4440')), "PA-RISC 8800 processor (1000 MHz, 64 MB)"]
+      examples << [File.read(fixtures('hpux','machinfo','superdome-server-SD32B')), "Intel(R) Itanium 2 9000 series"]
+      examples << [File.read(fixtures('hpux','machinfo','superdome2-16s')), "Intel(R)  Itanium(R)  Processor 9340 (1.6 GHz, 15 MB)"]
       examples
     end