facter 1.6.1 → 1.6.2

data/spec/unit/physicalprocessorcount_spec.rb

@@ -1,51 +1,57 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env rspec
 
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-require 'facter'
-
 describe "Physical processor count facts" do
-    before do
-        Facter.loadfacts
-    end
-    before do
-        Facter.clear
+
+  describe "on linux" do
+    before :each do
+      Facter.fact(:kernel).stubs(:value).returns("Linux")
+      File.stubs(:exists?).with('/sys/devices/system/cpu').returns(true)
     end
+
     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"])
-        Facter::Util::Resolution.stubs(:exec).with("cat /sys/devices/system/cpu/cpu0/topology/physical_package_id").returns("0")
+      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
+      Facter.fact(:physicalprocessorcount).value.should == 1
     end
 
     it "should return four physical CPUs" 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(%w{
-          /sys/devices/system/cpu/cpu0/topology/physical_package_id
-          /sys/devices/system/cpu/cpu1/topology/physical_package_id
-          /sys/devices/system/cpu/cpu2/topology/physical_package_id
-          /sys/devices/system/cpu/cpu3/topology/physical_package_id
-        })
-
-        Facter::Util::Resolution.stubs(:exec).with("cat /sys/devices/system/cpu/cpu0/topology/physical_package_id").returns("0")
-        Facter::Util::Resolution.stubs(:exec).with("cat /sys/devices/system/cpu/cpu1/topology/physical_package_id").returns("1")
-        Facter::Util::Resolution.stubs(:exec).with("cat /sys/devices/system/cpu/cpu2/topology/physical_package_id").returns("2")
-        Facter::Util::Resolution.stubs(:exec).with("cat /sys/devices/system/cpu/cpu3/topology/physical_package_id").returns("3")
-
-        Facter.fact(:physicalprocessorcount).value.should == 4
+      Dir.stubs(:glob).with("/sys/devices/system/cpu/cpu*/topology/physical_package_id").returns(%w{
+        /sys/devices/system/cpu/cpu0/topology/physical_package_id
+        /sys/devices/system/cpu/cpu1/topology/physical_package_id
+        /sys/devices/system/cpu/cpu2/topology/physical_package_id
+        /sys/devices/system/cpu/cpu3/topology/physical_package_id
+      })
+
+      Facter::Util::Resolution.stubs(:exec).with("cat /sys/devices/system/cpu/cpu0/topology/physical_package_id").returns("0")
+      Facter::Util::Resolution.stubs(:exec).with("cat /sys/devices/system/cpu/cpu1/topology/physical_package_id").returns("1")
+      Facter::Util::Resolution.stubs(:exec).with("cat /sys/devices/system/cpu/cpu2/topology/physical_package_id").returns("2")
+      Facter::Util::Resolution.stubs(:exec).with("cat /sys/devices/system/cpu/cpu3/topology/physical_package_id").returns("3")
+
+      Facter.fact(:physicalprocessorcount).value.should == 4
     end
+  end
+
+  describe "on windows" do
+    it "should return 4 physical CPUs" do
+      Facter.fact(:kernel).stubs(:value).returns("windows")
 
-    it "should return 4 physical CPUs on Windows" do
-        Facter.fact(:kernel).stubs(:value).returns("windows")
+      require 'facter/util/wmi'
+      ole = stub 'WIN32OLE'
+      Facter::Util::WMI.expects(:execquery).with("select Name from Win32_Processor").returns(ole)
+      ole.stubs(:Count).returns(4)
 
-        require 'facter/util/wmi'
-        ole = stub 'WIN32OLE'
-        Facter::Util::WMI.expects(:execquery).with("select Name from Win32_Processor").returns(ole)
-        ole.stubs(:Count).returns(4)
+      Facter.fact(:physicalprocessorcount).value.should == 4
+    end
+  end
 
-        Facter.fact(:physicalprocessorcount).value.should == 4
+  describe "on solaris" do
+    it "should use the output of psrinfo" do
+      Facter.fact(:kernel).stubs(:value).returns(:sunos)
+      Facter::Util::Resolution.expects(:exec).with("/usr/sbin/psrinfo -p").returns(1)
+      Facter.fact(:physicalprocessorcount).value.should == 1
     end
+  end
 end

data/spec/unit/processor_spec.rb

@@ -1,9 +1,14 @@
 #!/usr/bin/env ruby
 
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+$basedir = File.expand_path(File.dirname(__FILE__) + '/..')
+require File.join($basedir, 'spec_helper')
 
 require 'facter'
 
+def cpuinfo_fixture(filename)
+    cpuinfo = File.open(File.join($basedir, 'fixtures', 'cpuinfo', filename)).readlines
+end
+
 describe "Processor facts" do
   describe "on Windows" do
     before :each do
@@ -61,6 +66,182 @@ describe "Processor facts" do
       end
     end
   end
-end
 
+  describe "on Solaris" do
+    before :each do
+      Facter.collection.loader.load(:processor)
+      Facter.fact(:kernel).stubs(:value).returns(:sunos)
+    end
+
+    it "should detect the correct processor count on x86_64" do
+      fixture_data = File.read(File.expand_path(File.dirname(__FILE__) + '/../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
+
+    it "should detect the correct processor count on sparc" do
+      fixture_data = File.read(File.expand_path(File.dirname(__FILE__) + '/../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
+    end
+  end
+  
+  describe "on Unixes" do
+    before :each do
+      Facter.collection.loader.load(:processor)
+    end
+
+    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"))
+
+      Facter.fact(:processorcount).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"))
+    
+      Facter.fact(:processorcount).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"))
+    
+      Facter.fact(:processorcount).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"))
+    
+      Facter.fact(:processorcount).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"))
+    
+      Facter.fact(:processorcount).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"))
+    
+      Facter.fact(:processorcount).value.should == "1"
+    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"))
+    
+      Facter.fact(:processorcount).value.should == "2"
+    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"))
+    
+      Facter.fact(:processorcount).value.should == "3"
+    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"
+    end
+  
+    it "should be 2 on dual-processor Darwin box" do
+      Facter.fact(:kernel).stubs(:value).returns("Darwin")
+      Facter::Util::Resolution.stubs(:exec).with("sysctl -n hw.ncpu").returns('2')
+  
+      Facter.fact(:processorcount).value.should == "2"
+    end
+    
+    it "should be 2 on dual-processor OpenBSD box" do
+      Facter.fact(:kernel).stubs(:value).returns("OpenBSD")
+      Facter::Util::Resolution.stubs(:exec).with("sysctl -n hw.ncpu").returns('2')
+  
+      Facter.fact(:processorcount).value.should == "2"
+    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
+ 
+    it "should be 6 on six-processor AIX box" do
+      Facter.fact(:kernel).stubs(:value).returns("AIX")
+      Facter::Util::Resolution.stubs(:exec).with("lsdev -Cc processor").returns("proc0 Available 00-00 Processor\nproc2 Available 00-02 Processor\nproc4 Available 00-04 Processor\nproc6 Available 00-06 Processor\nproc8 Available 00-08 Processor\nproc10 Available 00-10 Processor")
+      Facter::Util::Resolution.stubs(:exec).with("lsattr -El proc0 -a type").returns("type PowerPC_POWER3 Processor type False")
+  
+      Facter.fact(:processorcount).value.should == "6"
+    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"
+    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"
+    end
+  end
+end

data/spec/unit/util/processor_spec.rb

@@ -0,0 +1,62 @@
+#!/usr/bin/env ruby
+
+$basedir = File.expand_path(File.dirname(__FILE__) + '/../..')
+require File.join($basedir, 'spec_helper')
+
+require 'facter/util/processor'
+
+def cpuinfo_fixture(filename)
+  cpuinfo = File.open(File.join($basedir, 'fixtures', 'cpuinfo', filename)).readlines
+end
+
+describe Facter::Util::Processor do
+  it "should get the processor description from the amd64solo fixture" 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"))
+    
+    Facter::Util::Processor.enum_cpuinfo[0].should == "Intel(R) Core(TM)2 Duo CPU     P8700  @ 2.53GHz"
+  end
+
+  it "should get the processor descriptions from the amd64dual fixture" 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"))
+    
+    Facter::Util::Processor.enum_cpuinfo[0].should == "Intel(R) Core(TM)2 Duo CPU     P8700  @ 2.53GHz"
+    Facter::Util::Processor.enum_cpuinfo[1].should == "Intel(R) Core(TM)2 Duo CPU     P8700  @ 2.53GHz"
+  end
+  
+  it "should get the processor descriptions from the amd64tri fixture" 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"))
+    
+    Facter::Util::Processor.enum_cpuinfo[0].should == "Intel(R) Core(TM)2 Duo CPU     P8700  @ 2.53GHz"
+    Facter::Util::Processor.enum_cpuinfo[1].should == "Intel(R) Core(TM)2 Duo CPU     P8700  @ 2.53GHz"
+    Facter::Util::Processor.enum_cpuinfo[2].should == "Intel(R) Core(TM)2 Duo CPU     P8700  @ 2.53GHz"
+  end
+  
+  it "should get the processor descriptions from the amd64quad fixture" 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::Util::Processor.enum_cpuinfo[0].should == "Quad-Core AMD Opteron(tm) Processor 2374 HE"
+    Facter::Util::Processor.enum_cpuinfo[1].should == "Quad-Core AMD Opteron(tm) Processor 2374 HE"
+    Facter::Util::Processor.enum_cpuinfo[2].should == "Quad-Core AMD Opteron(tm) Processor 2374 HE"
+    Facter::Util::Processor.enum_cpuinfo[3].should == "Quad-Core AMD Opteron(tm) Processor 2374 HE"
+  end
+
+  it "should get the processor type on AIX box" do
+    Facter.fact(:kernel).stubs(:value).returns("AIX")
+    Facter::Util::Resolution.stubs(:exec).with("lsdev -Cc processor").returns("proc0 Available 00-00 Processor\nproc2 Available 00-02 Processor\nproc4 Available 00-04 Processor\nproc6 Available 00-06 Processor\nproc8 Available 00-08 Processor\nproc10 Available 00-10 Processor")
+    Facter::Util::Resolution.stubs(:exec).with("lsattr -El proc0 -a type").returns("type PowerPC_POWER3 Processor type False")
+
+    Facter::Util::Processor.enum_lsdev[0].should == "PowerPC_POWER3"
+  end
+end

data/spec/unit/util/uptime_spec.rb

@@ -28,10 +28,10 @@ describe Facter::Util::Uptime do
 
       it "should use 'sysctl kern.boottime'" do
         if [1].pack("L") == [1].pack("V") # Determine endianness
-	  sysctl_output_filename = 'sysctl_kern_boottime_little_endian'
-	else
-	  sysctl_output_filename = 'sysctl_kern_boottime_big_endian'
-	end
+          sysctl_output_filename = 'sysctl_kern_boottime_little_endian'
+        else
+          sysctl_output_filename = 'sysctl_kern_boottime_big_endian'
+        end
         sysctl_output_file = File.join(SPECDIR, 'fixtures', 'uptime', sysctl_output_filename) # Aug 01 14:13:47 -0700 2010
         Facter::Util::Uptime.stubs(:uptime_sysctl_cmd).returns("cat \"#{sysctl_output_file}\"")
         Time.stubs(:now).returns Time.parse("Aug 01 15:13:47 -0700 2010") # one hour later

data/spec/unit/util/virtual_spec.rb

@@ -9,22 +9,43 @@ describe Facter::Util::Virtual do
     end
     it "should detect openvz" do
         FileTest.stubs(:directory?).with("/proc/vz").returns(true)
-        FileTest.stubs(:exists?).with("/proc/vz/veinfo").returns(true)
+        Dir.stubs(:glob).with("/proc/vz/*").returns(['vzquota'])
         Facter::Util::Virtual.should be_openvz
     end
 
-    it "should identify openvzhn when version file exists" do
+    it "should not detect openvz when /proc/lve/list is present" do
+        FileTest.stubs(:file?).with("/proc/lve/list").returns(true)
+        Facter::Util::Virtual.should_not be_openvz
+    end
+
+    it "should not detect openvz when /proc/vz/ is empty" do
+        FileTest.stubs(:file?).with("/proc/lve/list").returns(false)
+        FileTest.stubs(:directory?).with("/proc/vz").returns(true)
+        Dir.stubs(:glob).with("/proc/vz/*").returns([])
+        Facter::Util::Virtual.should_not be_openvz
+    end
+
+    it "should identify openvzhn when /proc/self/status has envID of 0" do
         Facter::Util::Virtual.stubs(:openvz?).returns(true)
-        FileTest.stubs(:exists?).with("/proc/vz/version").returns(true)
+        FileTest.stubs(:exists?).with("/proc/self/status").returns(true)
+        Facter::Util::Resolution.stubs(:exec).with('grep "envID" /proc/self/status').returns("envID:  0")
         Facter::Util::Virtual.openvz_type().should == "openvzhn"
     end
 
-    it "should identify openvzve when no version file exists" do
+    it "should identify openvzve when /proc/self/status has envID of 0" do
         Facter::Util::Virtual.stubs(:openvz?).returns(true)
-        FileTest.stubs(:exists?).with("/proc/vz/version").returns(false)
+        FileTest.stubs(:exists?).with('/proc/self/status').returns(true)
+        Facter::Util::Resolution.stubs(:exec).with('grep "envID" /proc/self/status').returns("envID:  666")
         Facter::Util::Virtual.openvz_type().should == "openvzve"
     end
 
+    it "should not attempt to identify openvz when /proc/self/status has no envID" do
+        Facter::Util::Virtual.stubs(:openvz?).returns(true)
+        FileTest.stubs(:exists?).with('/proc/self/status').returns(true)
+        Facter::Util::Resolution.stubs(:exec).with('grep "envID" /proc/self/status').returns("")
+        Facter::Util::Virtual.openvz_type().should be_nil
+    end
+
     it "should identify Solaris zones when non-global zone" do
         Facter::Util::Resolution.stubs(:exec).with("/sbin/zonename").returns("somezone")
         Facter::Util::Virtual.should be_zone

data/spec/unit/virtual_spec.rb

@@ -72,8 +72,12 @@ describe "Virtual fact" do
   describe "on Linux" do
 
       before do
-        Facter::Util::Resolution.expects(:exec).with("vmware -v").returns false
+        Facter::Util::Resolution.stubs(:exec).with("vmware -v").returns false
         Facter.fact(:operatingsystem).stubs(:value).returns(true)
+        # Ensure the tests don't fail on Xen
+        FileTest.stubs(:exists?).with("/proc/sys/xen").returns false
+        FileTest.stubs(:exists?).with("/sys/bus/xen").returns false
+        FileTest.stubs(:exists?).with("/proc/xen").returns false
         Facter.fact(:architecture).stubs(:value).returns(true)
       end
 
@@ -135,14 +139,28 @@ describe "Virtual fact" do
           Facter.fact(:virtual).value.should == "virtualbox"
       end
 
+      it "should be hyperv with Microsoft vendor name from lspci" do
+          Facter.fact(:kernel).stubs(:value).returns("Linux")
+          Facter::Util::Resolution.stubs(:exec).with('lspci').returns("00:08.0 VGA compatible controller: Microsoft Corporation Hyper-V virtual VGA")
+          Facter.fact(:virtual).value.should == "hyperv"
+      end
+
+      it "should be hyperv with Microsoft vendor name from dmidecode" do
+          Facter.fact(:kernel).stubs(:value).returns("Linux")
+          Facter::Util::Resolution.stubs(:exec).with('lspci').returns(nil)
+          Facter::Util::Resolution.stubs(:exec).with('dmidecode').returns("System Information\nManufacturer: Microsoft Corporation\nProduct Name: Virtual Machine")
+          Facter.fact(:virtual).value.should == "hyperv"
+      end
+
   end
   describe "on Solaris" do
       before(:each) do
-          Facter::Util::Resolution.expects(:exec).with("vmware -v").returns false
+          Facter::Util::Resolution.stubs(:exec).with("vmware -v").returns false
       end
 
       it "should be vmware with VMWare vendor name from prtdiag" do
           Facter.fact(:kernel).stubs(:value).returns("SunOS")
+          Facter.fact(:hardwaremodel).stubs(:value).returns(nil)
           Facter::Util::Resolution.stubs(:exec).with('lspci').returns(nil)
           Facter::Util::Resolution.stubs(:exec).with('dmidecode').returns(nil)
           Facter::Util::Resolution.stubs(:exec).with('prtdiag').returns("System Configuration: VMware, Inc. VMware Virtual Platform")
@@ -151,6 +169,7 @@ describe "Virtual fact" do
 
       it "should be parallels with Parallels vendor name from prtdiag" do
           Facter.fact(:kernel).stubs(:value).returns("SunOS")
+          Facter.fact(:hardwaremodel).stubs(:value).returns(nil)
           Facter::Util::Resolution.stubs(:exec).with('lspci').returns(nil)
           Facter::Util::Resolution.stubs(:exec).with('dmidecode').returns(nil)
           Facter::Util::Resolution.stubs(:exec).with('prtdiag').returns("System Configuration: Parallels Virtual Platform")
@@ -159,11 +178,31 @@ describe "Virtual fact" do
 
       it "should be virtualbox with VirtualBox vendor name from prtdiag" do
           Facter.fact(:kernel).stubs(:value).returns("SunOS")
+          Facter.fact(:hardwaremodel).stubs(:value).returns(nil)
           Facter::Util::Resolution.stubs(:exec).with('lspci').returns(nil)
           Facter::Util::Resolution.stubs(:exec).with('dmidecode').returns(nil)
           Facter::Util::Resolution.stubs(:exec).with('prtdiag').returns("System Configuration: innotek GmbH VirtualBox")
           Facter.fact(:virtual).value.should == "virtualbox"
       end
+
+      it "should be xen0 with xen dom0 files in /proc" do
+          Facter.fact(:kernel).stubs(:value).returns("Linux")
+          Facter.fact(:operatingsystem).stubs(:value).returns("Linux")
+          Facter.fact(:hardwaremodel).stubs(:value).returns("i386")
+          Facter::Util::Virtual.expects(:xen?).returns(true)
+          FileTest.expects(:exists?).with("/proc/xen/xsd_kva").returns(true)
+          Facter.fact(:virtual).value.should == "xen0"
+      end
+      
+      it "should be xenu with xen domU files in /proc" do
+          Facter.fact(:kernel).stubs(:value).returns("Linux")
+          Facter.fact(:operatingsystem).stubs(:value).returns("Linux")
+          Facter.fact(:hardwaremodel).stubs(:value).returns("i386")
+          Facter::Util::Virtual.expects(:xen?).returns(true)
+          FileTest.expects(:exists?).with("/proc/xen/xsd_kva").returns(false)
+          FileTest.expects(:exists?).with("/proc/xen/capabilities").returns(true)
+          Facter.fact(:virtual).value.should == "xenu"
+      end
   end
 end
 
@@ -259,4 +298,10 @@ describe "is_virtual fact" do
         Facter.fact(:virtual).stubs(:value).returns("openvzhn")
         Facter.fact(:is_virtual).value.should == "false"
     end
+
+    it "should be true when running on hyperv" do
+        Facter.fact(:kernel).stubs(:value).returns("Linux")
+        Facter.fact(:virtual).stubs(:value).returns("hyperv")
+        Facter.fact(:is_virtual).value.should == "true"
+    end
 end