facter 1.6.2 → 1.6.3

data/spec/unit/util/virtual_spec.rb

@@ -4,172 +4,172 @@ require 'facter/util/virtual'
 
 describe Facter::Util::Virtual do
 
-    after do
-        Facter.clear
-    end
-    it "should detect openvz" do
-        FileTest.stubs(:directory?).with("/proc/vz").returns(true)
-        Dir.stubs(:glob).with("/proc/vz/*").returns(['vzquota'])
-        Facter::Util::Virtual.should be_openvz
-    end
-
-    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)
+  after do
+    Facter.clear
+  end
+  it "should detect openvz" do
+    FileTest.stubs(:directory?).with("/proc/vz").returns(true)
+    Dir.stubs(:glob).with("/proc/vz/*").returns(['vzquota'])
+    Facter::Util::Virtual.should be_openvz
+  end
+
+  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/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 /proc/self/status has envID of 0" 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("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
+  end
+
+  it "should not identify Solaris zones when global zone" do
+    Facter::Util::Resolution.stubs(:exec).with("/sbin/zonename").returns("global")
+    Facter::Util::Virtual.should_not be_zone
+  end
+
+  it "should not detect vserver if no self status" do
+    FileTest.stubs(:exists?).with("/proc/self/status").returns(false)
+    Facter::Util::Virtual.should_not be_vserver
+  end
+
+  it "should detect vserver when vxid present in process status" do
+    FileTest.stubs(:exists?).with("/proc/self/status").returns(true)
+    File.stubs(:read).with("/proc/self/status").returns("VxID: 42\n")
+    Facter::Util::Virtual.should be_vserver
+  end
+
+  it "should detect vserver when s_context present in process status" do
+    FileTest.stubs(:exists?).with("/proc/self/status").returns(true)
+    File.stubs(:read).with("/proc/self/status").returns("s_context: 42\n")
+    Facter::Util::Virtual.should be_vserver
+  end
+
+  it "should not detect vserver when vserver flags not present in process status" do
+    FileTest.stubs(:exists?).with("/proc/self/status").returns(true)
+    File.stubs(:read).with("/proc/self/status").returns("wibble: 42\n")
+    Facter::Util::Virtual.should_not be_vserver
+  end
+
+  fixture_path = File.join(SPECDIR, 'fixtures', 'virtual', 'proc_self_status')
+
+  test_cases = [
+    [File.join(fixture_path, 'vserver_2_1', 'guest'), true, 'vserver 2.1 guest'],
+    [File.join(fixture_path, 'vserver_2_1', 'host'),  true, 'vserver 2.1 host'],
+    [File.join(fixture_path, 'vserver_2_3', 'guest'), true, 'vserver 2.3 guest'],
+    [File.join(fixture_path, 'vserver_2_3', 'host'),  true, 'vserver 2.3 host']
+  ]
+
+  test_cases.each do |status_file, expected, description|
+    describe "with /proc/self/status from #{description}" do
+      it "should detect vserver as #{expected.inspect}" do
+        status = File.read(status_file)
         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 /proc/self/status has envID of 0" 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("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
-    end
-
-    it "should not identify Solaris zones when global zone" do
-        Facter::Util::Resolution.stubs(:exec).with("/sbin/zonename").returns("global")
-        Facter::Util::Virtual.should_not be_zone
-    end
-
-    it "should not detect vserver if no self status" do
-        FileTest.stubs(:exists?).with("/proc/self/status").returns(false)
-        Facter::Util::Virtual.should_not be_vserver
-    end
-
-    it "should detect vserver when vxid present in process status" do
-        FileTest.stubs(:exists?).with("/proc/self/status").returns(true)
-        File.stubs(:read).with("/proc/self/status").returns("VxID: 42\n")
-        Facter::Util::Virtual.should be_vserver
-    end
-
-    it "should detect vserver when s_context present in process status" do
-        FileTest.stubs(:exists?).with("/proc/self/status").returns(true)
-        File.stubs(:read).with("/proc/self/status").returns("s_context: 42\n")
-        Facter::Util::Virtual.should be_vserver
-    end
-
-    it "should not detect vserver when vserver flags not present in process status" do
-        FileTest.stubs(:exists?).with("/proc/self/status").returns(true)
-        File.stubs(:read).with("/proc/self/status").returns("wibble: 42\n")
-        Facter::Util::Virtual.should_not be_vserver
-    end
-
-    fixture_path = File.join(SPECDIR, 'fixtures', 'virtual', 'proc_self_status')
-
-    test_cases = [
-        [File.join(fixture_path, 'vserver_2_1', 'guest'), true, 'vserver 2.1 guest'],
-        [File.join(fixture_path, 'vserver_2_1', 'host'),  true, 'vserver 2.1 host'],
-        [File.join(fixture_path, 'vserver_2_3', 'guest'), true, 'vserver 2.3 guest'],
-        [File.join(fixture_path, 'vserver_2_3', 'host'),  true, 'vserver 2.3 host']
-    ]
-
-    test_cases.each do |status_file, expected, description|
-        describe "with /proc/self/status from #{description}" do
-            it "should detect vserver as #{expected.inspect}" do
-                status = File.read(status_file)
-                FileTest.stubs(:exists?).with("/proc/self/status").returns(true)
-                File.stubs(:read).with("/proc/self/status").returns(status)
-                Facter::Util::Virtual.vserver?.should == expected
-            end
-        end
-    end
-
-    it "should identify vserver_host when /proc/virtual exists" do
-        Facter::Util::Virtual.expects(:vserver?).returns(true)
-        FileTest.stubs(:exists?).with("/proc/virtual").returns(true)
-        Facter::Util::Virtual.vserver_type().should == "vserver_host"
-    end
-
-    it "should identify vserver_type as vserver when /proc/virtual does not exist" do
-        Facter::Util::Virtual.expects(:vserver?).returns(true)
-        FileTest.stubs(:exists?).with("/proc/virtual").returns(false)
-        Facter::Util::Virtual.vserver_type().should == "vserver"
-    end
-
-    it "should detect xen when /proc/sys/xen exists" do
-        FileTest.expects(:exists?).with("/proc/sys/xen").returns(true)
-        Facter::Util::Virtual.should be_xen
-    end
-
-    it "should detect xen when /sys/bus/xen exists" do
-        FileTest.expects(:exists?).with("/proc/sys/xen").returns(false)
-        FileTest.expects(:exists?).with("/sys/bus/xen").returns(true)
-        Facter::Util::Virtual.should be_xen
-    end
-
-    it "should detect xen when /proc/xen exists" do
-        FileTest.expects(:exists?).with("/proc/sys/xen").returns(false)
-        FileTest.expects(:exists?).with("/sys/bus/xen").returns(false)
-        FileTest.expects(:exists?).with("/proc/xen").returns(true)
-        Facter::Util::Virtual.should be_xen
-    end
-
-    it "should not detect xen when no sysfs/proc xen directories exist" do
-        FileTest.expects(:exists?).with("/proc/sys/xen").returns(false)
-        FileTest.expects(:exists?).with("/sys/bus/xen").returns(false)
-        FileTest.expects(:exists?).with("/proc/xen").returns(false)
-        Facter::Util::Virtual.should_not be_xen
-    end
-
-    it "should detect kvm" do
-        FileTest.stubs(:exists?).with("/proc/cpuinfo").returns(true)
-        File.stubs(:read).with("/proc/cpuinfo").returns("model name : QEMU Virtual CPU version 0.9.1\n")
-        Facter::Util::Virtual.should be_kvm
-    end
-
-    it "should detect kvm on FreeBSD" do
-        FileTest.stubs(:exists?).with("/proc/cpuinfo").returns(false)
-        Facter.fact(:kernel).stubs(:value).returns("FreeBSD")
-        Facter::Util::Resolution.stubs(:exec).with("/sbin/sysctl -n hw.model").returns("QEMU Virtual CPU version 0.12.4")
-        Facter::Util::Virtual.should be_kvm
-    end
-
-    it "should identify FreeBSD jail when in jail" do
-        Facter.fact(:kernel).stubs(:value).returns("FreeBSD")
-        Facter::Util::Resolution.stubs(:exec).with("/sbin/sysctl -n security.jail.jailed").returns("1")
-        Facter::Util::Virtual.should be_jail
-    end
-
-    it "should not identify GNU/kFreeBSD jail when not in jail" do
-        Facter.fact(:kernel).stubs(:value).returns("GNU/kFreeBSD")
-        Facter::Util::Resolution.stubs(:exec).with("/bin/sysctl -n security.jail.jailed").returns("0")
-        Facter::Util::Virtual.should_not be_jail
-    end
-
-    it "should detect hpvm on HP-UX" do
-        Facter.fact(:kernel).stubs(:value).returns("HP-UX")
-        Facter::Util::Resolution.stubs(:exec).with("/usr/bin/getconf MACHINE_MODEL").returns('ia64 hp server Integrity Virtual Machine')
-        Facter::Util::Virtual.should be_hpvm
-    end
-
-    it "should not detect hpvm on HP-UX when not in hpvm" do
-        Facter.fact(:kernel).stubs(:value).returns("HP-UX")
-        Facter::Util::Resolution.stubs(:exec).with("/usr/bin/getconf MACHINE_MODEL").returns('ia64 hp server rx660')
-        Facter::Util::Virtual.should_not be_hpvm
-    end
+        File.stubs(:read).with("/proc/self/status").returns(status)
+        Facter::Util::Virtual.vserver?.should == expected
+      end
+    end
+  end
+
+  it "should identify vserver_host when /proc/virtual exists" do
+    Facter::Util::Virtual.expects(:vserver?).returns(true)
+    FileTest.stubs(:exists?).with("/proc/virtual").returns(true)
+    Facter::Util::Virtual.vserver_type().should == "vserver_host"
+  end
+
+  it "should identify vserver_type as vserver when /proc/virtual does not exist" do
+    Facter::Util::Virtual.expects(:vserver?).returns(true)
+    FileTest.stubs(:exists?).with("/proc/virtual").returns(false)
+    Facter::Util::Virtual.vserver_type().should == "vserver"
+  end
+
+  it "should detect xen when /proc/sys/xen exists" do
+    FileTest.expects(:exists?).with("/proc/sys/xen").returns(true)
+    Facter::Util::Virtual.should be_xen
+  end
+
+  it "should detect xen when /sys/bus/xen exists" do
+    FileTest.expects(:exists?).with("/proc/sys/xen").returns(false)
+    FileTest.expects(:exists?).with("/sys/bus/xen").returns(true)
+    Facter::Util::Virtual.should be_xen
+  end
+
+  it "should detect xen when /proc/xen exists" do
+    FileTest.expects(:exists?).with("/proc/sys/xen").returns(false)
+    FileTest.expects(:exists?).with("/sys/bus/xen").returns(false)
+    FileTest.expects(:exists?).with("/proc/xen").returns(true)
+    Facter::Util::Virtual.should be_xen
+  end
+
+  it "should not detect xen when no sysfs/proc xen directories exist" do
+    FileTest.expects(:exists?).with("/proc/sys/xen").returns(false)
+    FileTest.expects(:exists?).with("/sys/bus/xen").returns(false)
+    FileTest.expects(:exists?).with("/proc/xen").returns(false)
+    Facter::Util::Virtual.should_not be_xen
+  end
+
+  it "should detect kvm" do
+    FileTest.stubs(:exists?).with("/proc/cpuinfo").returns(true)
+    File.stubs(:read).with("/proc/cpuinfo").returns("model name : QEMU Virtual CPU version 0.9.1\n")
+    Facter::Util::Virtual.should be_kvm
+  end
+
+  it "should detect kvm on FreeBSD" do
+    FileTest.stubs(:exists?).with("/proc/cpuinfo").returns(false)
+    Facter.fact(:kernel).stubs(:value).returns("FreeBSD")
+    Facter::Util::Resolution.stubs(:exec).with("/sbin/sysctl -n hw.model").returns("QEMU Virtual CPU version 0.12.4")
+    Facter::Util::Virtual.should be_kvm
+  end
+
+  it "should identify FreeBSD jail when in jail" do
+    Facter.fact(:kernel).stubs(:value).returns("FreeBSD")
+    Facter::Util::Resolution.stubs(:exec).with("/sbin/sysctl -n security.jail.jailed").returns("1")
+    Facter::Util::Virtual.should be_jail
+  end
+
+  it "should not identify GNU/kFreeBSD jail when not in jail" do
+    Facter.fact(:kernel).stubs(:value).returns("GNU/kFreeBSD")
+    Facter::Util::Resolution.stubs(:exec).with("/bin/sysctl -n security.jail.jailed").returns("0")
+    Facter::Util::Virtual.should_not be_jail
+  end
+
+  it "should detect hpvm on HP-UX" do
+    Facter.fact(:kernel).stubs(:value).returns("HP-UX")
+    Facter::Util::Resolution.stubs(:exec).with("/usr/bin/getconf MACHINE_MODEL").returns('ia64 hp server Integrity Virtual Machine')
+    Facter::Util::Virtual.should be_hpvm
+  end
+
+  it "should not detect hpvm on HP-UX when not in hpvm" do
+    Facter.fact(:kernel).stubs(:value).returns("HP-UX")
+    Facter::Util::Resolution.stubs(:exec).with("/usr/bin/getconf MACHINE_MODEL").returns('ia64 hp server rx660')
+    Facter::Util::Virtual.should_not be_hpvm
+  end
 end

data/spec/unit/util/vlans_spec.rb

@@ -5,10 +5,10 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'facter/util/vlans'
 
 describe Facter::Util::Vlans do
-    it "should return a list of vlans on Linux" do
-        sample_output_file = File.dirname(__FILE__) + '/../data/linux_vlan_config'
-        linux_vlanconfig = File.new(sample_output_file).read();
-        Facter::Util::Vlans.stubs(:get_vlan_config).returns(linux_vlanconfig)
-        Facter::Util::Vlans.get_vlans().should == %{400,300,200,100}
-    end
+  it "should return a list of vlans on Linux" do
+    sample_output_file = File.dirname(__FILE__) + '/../data/linux_vlan_config'
+    linux_vlanconfig = File.new(sample_output_file).read();
+    Facter::Util::Vlans.stubs(:get_vlan_config).returns(linux_vlanconfig)
+    Facter::Util::Vlans.get_vlans().should == %{400,300,200,100}
+  end
 end

data/spec/unit/virtual_spec.rb

@@ -6,302 +6,302 @@ require 'facter/util/macosx'
 
 describe "Virtual fact" do
   before do
-      Facter::Util::Virtual.stubs(:zone?).returns(false)
-      Facter::Util::Virtual.stubs(:openvz?).returns(false)
-      Facter::Util::Virtual.stubs(:vserver?).returns(false)
-      Facter::Util::Virtual.stubs(:xen?).returns(false)
-      Facter::Util::Virtual.stubs(:kvm?).returns(false)
-      Facter::Util::Virtual.stubs(:hpvm?).returns(false)
-      Facter::Util::Virtual.stubs(:zlinux?).returns(false)
+    Facter::Util::Virtual.stubs(:zone?).returns(false)
+    Facter::Util::Virtual.stubs(:openvz?).returns(false)
+    Facter::Util::Virtual.stubs(:vserver?).returns(false)
+    Facter::Util::Virtual.stubs(:xen?).returns(false)
+    Facter::Util::Virtual.stubs(:kvm?).returns(false)
+    Facter::Util::Virtual.stubs(:hpvm?).returns(false)
+    Facter::Util::Virtual.stubs(:zlinux?).returns(false)
   end
 
   it "should be zone on Solaris when a zone" do
-      Facter.fact(:kernel).stubs(:value).returns("SunOS")
-      Facter::Util::Virtual.stubs(:zone?).returns(true)
-      Facter::Util::Virtual.stubs(:vserver?).returns(false)
-      Facter::Util::Virtual.stubs(:xen?).returns(false)
-      Facter.fact(:virtual).value.should == "zone"
+    Facter.fact(:kernel).stubs(:value).returns("SunOS")
+    Facter::Util::Virtual.stubs(:zone?).returns(true)
+    Facter::Util::Virtual.stubs(:vserver?).returns(false)
+    Facter::Util::Virtual.stubs(:xen?).returns(false)
+    Facter.fact(:virtual).value.should == "zone"
   end
 
   it "should be jail on FreeBSD when a jail in kvm" do
-      Facter.fact(:kernel).stubs(:value).returns("FreeBSD")
-      Facter::Util::Virtual.stubs(:jail?).returns(true)
-      Facter::Util::Virtual.stubs(:kvm?).returns(true)
-      Facter.fact(:virtual).value.should == "jail"
+    Facter.fact(:kernel).stubs(:value).returns("FreeBSD")
+    Facter::Util::Virtual.stubs(:jail?).returns(true)
+    Facter::Util::Virtual.stubs(:kvm?).returns(true)
+    Facter.fact(:virtual).value.should == "jail"
   end
 
   it "should be hpvm on HP-UX when in HP-VM" do
-     Facter.fact(:kernel).stubs(:value).returns("HP-UX")
-     Facter::Util::Virtual.stubs(:hpvm?).returns(true)
-     Facter.fact(:virtual).value.should == "hpvm"
+   Facter.fact(:kernel).stubs(:value).returns("HP-UX")
+   Facter::Util::Virtual.stubs(:hpvm?).returns(true)
+   Facter.fact(:virtual).value.should == "hpvm"
   end
 
   it "should be zlinux on s390x" do
-     Facter.fact(:kernel).stubs(:value).returns("Linux")
-     Facter.fact(:architecture).stubs(:value).returns("s390x")
-     Facter::Util::Virtual.stubs(:zlinux?).returns(true)
-     Facter.fact(:virtual).value.should == "zlinux"
+   Facter.fact(:kernel).stubs(:value).returns("Linux")
+   Facter.fact(:architecture).stubs(:value).returns("s390x")
+   Facter::Util::Virtual.stubs(:zlinux?).returns(true)
+   Facter.fact(:virtual).value.should == "zlinux"
   end
 
   describe "on Darwin" do
-      it "should be parallels with Parallels vendor id" do
-          Facter.fact(:kernel).stubs(:value).returns("Darwin")
-          Facter::Util::Macosx.stubs(:profiler_data).returns({ "spdisplays_vendor-id" => "0x1ab8" })
-          Facter.fact(:virtual).value.should == "parallels"
-      end
-
-      it "should be parallels with Parallels vendor name" do
-          Facter.fact(:kernel).stubs(:value).returns("Darwin")
-          Facter::Util::Macosx.stubs(:profiler_data).returns({ "spdisplays_vendor" => "Parallels" })
-          Facter.fact(:virtual).value.should == "parallels"
-      end
-
-      it "should be vmware with VMWare vendor id" do
-          Facter.fact(:kernel).stubs(:value).returns("Darwin")
-          Facter::Util::Macosx.stubs(:profiler_data).returns({ "spdisplays_vendor-id" => "0x15ad" })
-          Facter.fact(:virtual).value.should == "vmware"
-      end
-
-      it "should be vmware with VMWare vendor name" do
-          Facter.fact(:kernel).stubs(:value).returns("Darwin")
-          Facter::Util::Macosx.stubs(:profiler_data).returns({ "spdisplays_vendor" => "VMWare" })
-          Facter.fact(:virtual).value.should == "vmware"
-      end
-  end
+    it "should be parallels with Parallels vendor id" do
+      Facter.fact(:kernel).stubs(:value).returns("Darwin")
+      Facter::Util::Macosx.stubs(:profiler_data).returns({ "spdisplays_vendor-id" => "0x1ab8" })
+      Facter.fact(:virtual).value.should == "parallels"
+    end
 
-  describe "on Linux" do
+    it "should be parallels with Parallels vendor name" do
+      Facter.fact(:kernel).stubs(:value).returns("Darwin")
+      Facter::Util::Macosx.stubs(:profiler_data).returns({ "spdisplays_vendor" => "Parallels" })
+      Facter.fact(:virtual).value.should == "parallels"
+    end
 
-      before do
-        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
-
-      it "should be parallels with Parallels vendor id from lspci" do
-          Facter.fact(:kernel).stubs(:value).returns("Linux")
-          Facter::Util::Resolution.stubs(:exec).with('lspci').returns("01:00.0 VGA compatible controller: Unknown device 1ab8:4005")
-          Facter.fact(:virtual).value.should == "parallels"
-      end
-
-      it "should be parallels with Parallels vendor name from lspci" do
-          Facter.fact(:kernel).stubs(:value).returns("Linux")
-          Facter::Util::Resolution.stubs(:exec).with('lspci').returns("01:00.0 VGA compatible controller: Parallels Display Adapter")
-          Facter.fact(:virtual).value.should == "parallels"
-      end
-
-      it "should be vmware with VMware vendor name from lspci" do
-          Facter.fact(:kernel).stubs(:value).returns("Linux")
-          Facter::Util::Resolution.stubs(:exec).with('lspci').returns("00:0f.0 VGA compatible controller: VMware Inc [VMware SVGA II] PCI Display Adapter")
-          Facter.fact(:virtual).value.should == "vmware"
-      end
-
-      it "should be virtualbox with VirtualBox vendor name from lspci" do
-          Facter.fact(:kernel).stubs(:value).returns("Linux")
-          Facter::Util::Resolution.stubs(:exec).with('lspci').returns("00:02.0 VGA compatible controller: InnoTek Systemberatung GmbH VirtualBox Graphics Adapter")
-          Facter.fact(:virtual).value.should == "virtualbox"
-      end
-
-      it "should be vmware with VMWare 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("On Board Device 1 Information\nType: Video\nStatus: Disabled\nDescription: VMware SVGA II")
-          Facter.fact(:virtual).value.should == "vmware"
-      end
-
-      it "should be xenhvm with Xen HVM vendor name from lspci" do
-          Facter.fact(:kernel).stubs(:value).returns("Linux")
-          Facter::Util::Resolution.stubs(:exec).with('lspci').returns("00:03.0 Unassigned class [ff80]: XenSource, Inc. Xen Platform Device (rev 01)")
-          Facter.fact(:virtual).value.should == "xenhvm"
-      end
-
-      it "should be xenhvm with Xen HVM 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: Xen\nProduct Name: HVM domU")
-          Facter.fact(:virtual).value.should == "xenhvm"
-      end
-
-      it "should be parallels with Parallels 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("On Board Device Information\nType: Video\nStatus: Disabled\nDescription: Parallels Video Adapter")
-          Facter.fact(:virtual).value.should == "parallels"
-      end
-
-      it "should be virtualbox with VirtualBox 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("BIOS Information\nVendor: innotek GmbH\nVersion: VirtualBox\n\nSystem Information\nManufacturer: innotek GmbH\nProduct Name: VirtualBox\nFamily: Virtual Machine")
-          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
+    it "should be vmware with VMWare vendor id" do
+      Facter.fact(:kernel).stubs(:value).returns("Darwin")
+      Facter::Util::Macosx.stubs(:profiler_data).returns({ "spdisplays_vendor-id" => "0x15ad" })
+      Facter.fact(:virtual).value.should == "vmware"
+    end
 
+    it "should be vmware with VMWare vendor name" do
+      Facter.fact(:kernel).stubs(:value).returns("Darwin")
+      Facter::Util::Macosx.stubs(:profiler_data).returns({ "spdisplays_vendor" => "VMWare" })
+      Facter.fact(:virtual).value.should == "vmware"
+    end
   end
-  describe "on Solaris" do
-      before(:each) do
-          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")
-          Facter.fact(:virtual).value.should == "vmware"
-      end
-
-      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")
-          Facter.fact(:virtual).value.should == "parallels"
-      end
-
-      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
 
-describe "is_virtual fact" do
+  describe "on Linux" do
 
-    it "should be virtual when running on xen" do
-       Facter.fact(:kernel).stubs(:value).returns("Linux")
-       Facter.fact(:virtual).stubs(:value).returns("xenu")
-       Facter.fact(:is_virtual).value.should == "true"
+    before do
+    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
 
-    it "should be false when running on xen0" do
-       Facter.fact(:kernel).stubs(:value).returns("Linux")
-       Facter.fact(:virtual).stubs(:value).returns("xen0")
-       Facter.fact(:is_virtual).value.should == "false"
+    it "should be parallels with Parallels vendor id from lspci" do
+      Facter.fact(:kernel).stubs(:value).returns("Linux")
+      Facter::Util::Resolution.stubs(:exec).with('lspci').returns("01:00.0 VGA compatible controller: Unknown device 1ab8:4005")
+      Facter.fact(:virtual).value.should == "parallels"
     end
 
-    it "should be true when running on xenhvm" do
-       Facter.fact(:kernel).stubs(:value).returns("Linux")
-       Facter.fact(:virtual).stubs(:value).returns("xenhvm")
-       Facter.fact(:is_virtual).value.should == "true"
+    it "should be parallels with Parallels vendor name from lspci" do
+      Facter.fact(:kernel).stubs(:value).returns("Linux")
+      Facter::Util::Resolution.stubs(:exec).with('lspci').returns("01:00.0 VGA compatible controller: Parallels Display Adapter")
+      Facter.fact(:virtual).value.should == "parallels"
     end
 
-    it "should be false when running on physical" do
-       Facter.fact(:kernel).stubs(:value).returns("Linux")
-       Facter.fact(:virtual).stubs(:value).returns("physical")
-       Facter.fact(:is_virtual).value.should == "false"
+    it "should be vmware with VMware vendor name from lspci" do
+      Facter.fact(:kernel).stubs(:value).returns("Linux")
+      Facter::Util::Resolution.stubs(:exec).with('lspci').returns("00:0f.0 VGA compatible controller: VMware Inc [VMware SVGA II] PCI Display Adapter")
+      Facter.fact(:virtual).value.should == "vmware"
     end
 
-    it "should be true when running on vmware" do
-        Facter.fact(:kernel).stubs(:value).returns("Linux")
-        Facter.fact(:virtual).stubs(:value).returns("vmware")
-        Facter.fact(:is_virtual).value.should == "true"
+    it "should be virtualbox with VirtualBox vendor name from lspci" do
+      Facter.fact(:kernel).stubs(:value).returns("Linux")
+      Facter::Util::Resolution.stubs(:exec).with('lspci').returns("00:02.0 VGA compatible controller: InnoTek Systemberatung GmbH VirtualBox Graphics Adapter")
+      Facter.fact(:virtual).value.should == "virtualbox"
     end
 
-    it "should be true when running on virtualbox" do
-        Facter.fact(:kernel).stubs(:value).returns("Linux")
-        Facter.fact(:virtual).stubs(:value).returns("virtualbox")
-        Facter.fact(:is_virtual).value.should == "true"
+    it "should be vmware with VMWare 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("On Board Device 1 Information\nType: Video\nStatus: Disabled\nDescription: VMware SVGA II")
+      Facter.fact(:virtual).value.should == "vmware"
     end
 
-    it "should be true when running on openvzve" do
-        Facter.fact(:kernel).stubs(:value).returns("Linux")
-        Facter.fact(:virtual).stubs(:value).returns("openvzve")
-        Facter.fact(:is_virtual).value.should == "true"
+    it "should be xenhvm with Xen HVM vendor name from lspci" do
+      Facter.fact(:kernel).stubs(:value).returns("Linux")
+      Facter::Util::Resolution.stubs(:exec).with('lspci').returns("00:03.0 Unassigned class [ff80]: XenSource, Inc. Xen Platform Device (rev 01)")
+      Facter.fact(:virtual).value.should == "xenhvm"
     end
 
-    it "should be true when running on kvm" do
-        Facter.fact(:kernel).stubs(:value).returns("Linux")
-        Facter.fact(:virtual).stubs(:value).returns("kvm")
-        Facter.fact(:is_virtual).value.should == "true"
+    it "should be xenhvm with Xen HVM 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: Xen\nProduct Name: HVM domU")
+      Facter.fact(:virtual).value.should == "xenhvm"
     end
 
-    it "should be true when running in jail" do
-        Facter.fact(:kernel).stubs(:value).returns("FreeBSD")
-        Facter.fact(:virtual).stubs(:value).returns("jail")
-        Facter.fact(:is_virtual).value.should == "true"
+    it "should be parallels with Parallels 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("On Board Device Information\nType: Video\nStatus: Disabled\nDescription: Parallels Video Adapter")
+      Facter.fact(:virtual).value.should == "parallels"
     end
 
-    it "should be true when running in zone" do
-        Facter.fact(:kernel).stubs(:value).returns("SunOS")
-        Facter.fact(:virtual).stubs(:value).returns("zone")
-        Facter.fact(:is_virtual).value.should == "true"
+    it "should be virtualbox with VirtualBox 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("BIOS Information\nVendor: innotek GmbH\nVersion: VirtualBox\n\nSystem Information\nManufacturer: innotek GmbH\nProduct Name: VirtualBox\nFamily: Virtual Machine")
+      Facter.fact(:virtual).value.should == "virtualbox"
     end
 
-    it "should be true when running on hp-vm" do
-        Facter.fact(:kernel).stubs(:value).returns("HP-UX")
-        Facter.fact(:virtual).stubs(:value).returns("hpvm")
-        Facter.fact(:is_virtual).value.should == "true"
+    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 true when running on S390" do
-        Facter.fact(:architecture).stubs(:value).returns("s390x")
-        Facter.fact(:kernel).stubs(:value).returns("Linux")
-        Facter.fact(:virtual).stubs(:value).returns("zlinux")
-        Facter.fact(:is_virtual).value.should == "true"
+    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
 
-    it "should be true when running on parallels" do
-        Facter.fact(:kernel).stubs(:value).returns("Darwin")
-        Facter.fact(:virtual).stubs(:value).returns("parallels")
-        Facter.fact(:is_virtual).value.should == "true"
+  end
+  describe "on Solaris" do
+    before(:each) do
+      Facter::Util::Resolution.stubs(:exec).with("vmware -v").returns false
     end
 
-    it "should be false on vmware_server" do
-        Facter.fact(:kernel).stubs(:value).returns("Linux")
-        Facter.fact(:virtual).stubs(:value).returns("vmware_server")
-        Facter.fact(:is_virtual).value.should == "false"
+    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")
+      Facter.fact(:virtual).value.should == "vmware"
     end
 
-    it "should be false on openvz host nodes" do
-        Facter.fact(:kernel).stubs(:value).returns("Linux")
-        Facter.fact(:virtual).stubs(:value).returns("openvzhn")
-        Facter.fact(:is_virtual).value.should == "false"
+    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")
+      Facter.fact(:virtual).value.should == "parallels"
+    end
+
+    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 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"
+    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
+
+describe "is_virtual fact" do
+
+  it "should be virtual when running on xen" do
+     Facter.fact(:kernel).stubs(:value).returns("Linux")
+     Facter.fact(:virtual).stubs(:value).returns("xenu")
+     Facter.fact(:is_virtual).value.should == "true"
+  end
+
+  it "should be false when running on xen0" do
+     Facter.fact(:kernel).stubs(:value).returns("Linux")
+     Facter.fact(:virtual).stubs(:value).returns("xen0")
+     Facter.fact(:is_virtual).value.should == "false"
+  end
+
+  it "should be true when running on xenhvm" do
+     Facter.fact(:kernel).stubs(:value).returns("Linux")
+     Facter.fact(:virtual).stubs(:value).returns("xenhvm")
+     Facter.fact(:is_virtual).value.should == "true"
+  end
+
+  it "should be false when running on physical" do
+     Facter.fact(:kernel).stubs(:value).returns("Linux")
+     Facter.fact(:virtual).stubs(:value).returns("physical")
+     Facter.fact(:is_virtual).value.should == "false"
+  end
+
+  it "should be true when running on vmware" do
+    Facter.fact(:kernel).stubs(:value).returns("Linux")
+    Facter.fact(:virtual).stubs(:value).returns("vmware")
+    Facter.fact(:is_virtual).value.should == "true"
+  end
+
+  it "should be true when running on virtualbox" do
+    Facter.fact(:kernel).stubs(:value).returns("Linux")
+    Facter.fact(:virtual).stubs(:value).returns("virtualbox")
+    Facter.fact(:is_virtual).value.should == "true"
+  end
+
+  it "should be true when running on openvzve" do
+    Facter.fact(:kernel).stubs(:value).returns("Linux")
+    Facter.fact(:virtual).stubs(:value).returns("openvzve")
+    Facter.fact(:is_virtual).value.should == "true"
+  end
+
+  it "should be true when running on kvm" do
+    Facter.fact(:kernel).stubs(:value).returns("Linux")
+    Facter.fact(:virtual).stubs(:value).returns("kvm")
+    Facter.fact(:is_virtual).value.should == "true"
+  end
+
+  it "should be true when running in jail" do
+    Facter.fact(:kernel).stubs(:value).returns("FreeBSD")
+    Facter.fact(:virtual).stubs(:value).returns("jail")
+    Facter.fact(:is_virtual).value.should == "true"
+  end
+
+  it "should be true when running in zone" do
+    Facter.fact(:kernel).stubs(:value).returns("SunOS")
+    Facter.fact(:virtual).stubs(:value).returns("zone")
+    Facter.fact(:is_virtual).value.should == "true"
+  end
+
+  it "should be true when running on hp-vm" do
+    Facter.fact(:kernel).stubs(:value).returns("HP-UX")
+    Facter.fact(:virtual).stubs(:value).returns("hpvm")
+    Facter.fact(:is_virtual).value.should == "true"
+  end
+
+  it "should be true when running on S390" do
+    Facter.fact(:architecture).stubs(:value).returns("s390x")
+    Facter.fact(:kernel).stubs(:value).returns("Linux")
+    Facter.fact(:virtual).stubs(:value).returns("zlinux")
+    Facter.fact(:is_virtual).value.should == "true"
+  end
+
+  it "should be true when running on parallels" do
+    Facter.fact(:kernel).stubs(:value).returns("Darwin")
+    Facter.fact(:virtual).stubs(:value).returns("parallels")
+    Facter.fact(:is_virtual).value.should == "true"
+  end
+
+  it "should be false on vmware_server" do
+    Facter.fact(:kernel).stubs(:value).returns("Linux")
+    Facter.fact(:virtual).stubs(:value).returns("vmware_server")
+    Facter.fact(:is_virtual).value.should == "false"
+  end
+
+  it "should be false on openvz host nodes" do
+    Facter.fact(:kernel).stubs(:value).returns("Linux")
+    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