facter 1.6.13 → 1.6.14.rc1

data/spec/unit/processor_spec.rb

@@ -1,5 +1,6 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby
 
+require 'facter/util/processor'
 require 'spec_helper'
 
 def cpuinfo_fixture(filename)
@@ -70,6 +71,7 @@ describe "Processor facts" do
     before :each do
       Facter.collection.loader.load(:processor)
       Facter.fact(:kernel).stubs(:value).returns(:sunos)
+      Facter.stubs(:value).with(:kernelrelease).returns("5.10")
     end
 
     it "should detect the correct processor count on x86_64" do
@@ -193,14 +195,6 @@ describe "Processor facts" do
       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)
@@ -242,5 +236,77 @@ describe "Processor facts" do
 
       Facter.fact(:processorcount).value.should == "16"
     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 }
+
+      %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)
+
+            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)
+
+          Facter::Util::Resolution.expects(:exec).with("/usr/sbin/psrinfo").returns(psrinfo)
+          Facter.fact(:physicalprocessorcount).value.should == "2"
+        end
+      end
+    end
+  end
+end
+
+describe "processorX facts" do
+  describe "on AIX" do
+    def self.lsdev_examples
+      examples = []
+      examples << "proc0  Available 00-00 Processor\n" +
+        "proc4  Available 00-04 Processor\n" +
+        "proc8  Defined   00-08 Processor\n" +
+        "proc12 Defined   00-12 Processor\n"
+      examples
+    end
+
+    let(:lsattr) do
+      "type PowerPC_POWER5 Processor type False\n"
+    end
+
+    lsdev_examples.each_with_index do |lsdev_example, i|
+      context "lsdev example ##{i}" do
+        before :each do
+          Facter.fact(:kernel).stubs(:value).returns("AIX")
+          Facter::Util::Processor.stubs(:lsdev).returns(lsdev_example)
+          Facter::Util::Processor.stubs(:lsattr).returns(lsattr)
+          Facter.collection.loader.load(:processor)
+        end
+
+        lsdev_example.split("\n").each_with_index do |line, idx|
+          aix_idx = idx * 4
+          it "maps proc#{aix_idx} to processor#{idx} (#11609)" do
+            Facter.value("processor#{idx}").should == "PowerPC_POWER5"
+          end
+        end
+      end
+    end
   end
 end

data/spec/unit/selinux_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby
 
 require 'spec_helper'
 

data/spec/unit/uptime_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby
 
 require 'spec_helper'
 require 'facter/util/uptime'

data/spec/unit/util/collection_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby
 
 require 'spec_helper'
 require 'facter/util/collection'

data/spec/unit/util/config_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby
 
 require 'spec_helper'
 require 'facter/util/config'

data/spec/unit/util/confine_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby
 
 require 'spec_helper'
 require 'facter/util/confine'

data/spec/unit/util/ec2_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby
 
 require 'spec_helper'
 require 'facter/util/ec2'

data/spec/unit/util/fact_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby
 
 require 'spec_helper'
 require 'facter/util/fact'

data/spec/unit/util/ip_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby
 
 require 'spec_helper'
 require 'facter/util/ip'
@@ -228,8 +228,8 @@ describe Facter::Util::IP do
   it "should return fake macaddress information for infiniband on Linux when neither sysfs or /sbin/ip are available" do
     ifconfig_interface = my_fixture_read("linux_ifconfig_ib0")
 
-    File.stubs(:exists?).with("/sys/class/net/ib0/address").returns(false)
-    File.stubs(:exists?).with("/sbin/ip").returns(false)
+    File.expects(:exists?).with("/sys/class/net/ib0/address").returns(false)
+    File.expects(:exists?).with("/sbin/ip").returns(false)
     Facter::Util::IP.expects(:ifconfig_interface).with("ib0").returns(ifconfig_interface)
     Facter.stubs(:value).with(:kernel).returns("Linux")
 

data/spec/unit/util/loader_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby
 
 require 'spec_helper'
 require 'facter/util/loader'

data/spec/unit/util/macaddress_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby
 
 require 'spec_helper'
 require 'facter/util/macaddress'

data/spec/unit/util/macosx_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby
 
 require 'spec_helper'
 require 'facter/util/macosx'

data/spec/unit/util/manufacturer_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby
 
 require 'spec_helper'
 require 'facter/util/manufacturer'

data/spec/unit/util/monkey_patches_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+require 'tempfile'
+
+describe 'Monkey Patches' do
+  let(:subject) { "a b c d e f\ng h i j" }
+
+  context 'String' do
+    it "should respond to lines" do
+       subject.lines.to_a.should == ["a b c d e f\n", "g h i j"]
+    end
+    it "should accept a block" do
+      our_lines = []
+      subject.lines do |line| our_lines << line end
+      our_lines.should == ["a b c d e f\n", "g h i j"]
+    end
+  end
+
+  context 'IO' do
+    it "should respond to lines" do
+      our_lines = nil
+      Tempfile.open("lines") do | file |
+        file.write(subject)
+        file.flush
+        file.rewind
+        our_lines = file.lines.to_a
+      end
+      our_lines.should == ["a b c d e f\n", "g h i j"]
+    end
+    it "should accept a block" do
+      our_lines = []
+      file = Tempfile.new("lines")
+      file.write(subject)
+      file.flush
+      file.rewind
+      file.lines.each do |line| our_lines << line end
+      file.unlink
+      our_lines.should == ["a b c d e f\n", "g h i j"]
+    end
+  end
+
+end
+

data/spec/unit/util/processor_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby
 
 require 'spec_helper'
 require 'facter/util/processor'
@@ -50,14 +50,6 @@ describe Facter::Util::Processor do
     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
-
   it "should get the processor description on Solaris (x86)" do
     Facter.fact(:kernel).stubs(:value).returns("SunOS")
     Facter.fact(:architecture).stubs(:value).returns("i86pc")

data/spec/unit/util/registry_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'facter/operatingsystem'
 require 'facter/util/registry'

data/spec/unit/util/resolution_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby
 
 require 'spec_helper'
 require 'facter/util/resolution'

data/spec/unit/util/uptime_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby
 
 require 'spec_helper'
 require 'facter/util/uptime'
@@ -41,31 +41,72 @@ describe Facter::Util::Uptime do
 
       describe "nor is 'sysctl kern.boottime'" do
         before :each do
-          Facter::Util::Uptime.stubs(:uptime_sysctl_cmd).returns("cat \"#{@nonexistent_file}\"")
+          Facter::Util::Uptime.stubs(:uptime_proc_uptime).returns(false)
+          Facter::Util::Uptime.stubs(:uptime_sysctl).returns(false)
+          Facter.fact(:kernel).stubs(:value).returns('SunOS')
         end
 
-        it "should use 'kstat -p unix:::boot_time'" do
-          kstat_output_file = my_fixture('kstat_boot_time') # unix:0:system_misc:boot_time    1236919980
-          Facter::Util::Uptime.stubs(:uptime_kstat_cmd).returns("cat \"#{kstat_output_file}\"")
-          Time.stubs(:now).returns Time.at(1236923580) #one hour later
-          Facter::Util::Uptime.get_uptime_seconds_unix.should == 60 * 60
-        end
-
-        describe "nor is 'kstat -p unix:::boot_time'" do
-          before :each do
-            Facter::Util::Uptime.stubs(:uptime_kstat_cmd).returns("cat \"#{@nonexistent_file}\"")
-          end
+        describe "should use 'uptime' command" do
+          # Note about uptime variations.
+          # Solaris (I have examined 5.6, 5.7, 5.8, 5.9, 5.10 & 5.11) and HP-UX (11.00, 11.11, 11.23, 11.31) have time
+          #   right justified at at 8 characters, and two spaces before 'up'.
+          # Solaris differs from all other Unices (and Linux) in that the plural/singular case of minutes/hours/days are
+          #   written min(s)/hr(s)/day(s) instead of min/mins/hr/hrs etc., e.g. 1 min(s), 2 min(s) as opposed to
+          #   1 min, 2 mins, etc.
+          # AIX (4.3.3, 5.2, 5.3, 6.1) differs from other SysV Unices in that times are padded with a leading 0 in the
+          #   hour column where necessary, and have AM/PM in uppercase, and there are three spaces before 'up'.
+          # Tru64 (4.0, 5.1) differs from other SysV Unices in that times are in 24 hour format, and there are no
+          #   leading spaces.
+          # Linux (RHEL, uptime version 2.0.7) differs from the SysV Unices in that only minutes before the first hour
+          #   are written as 1 min, 2 min, 3 min etc. and after that full hours are rendered 1:00 or 21:00.  Time of
+          #   day was written 5:37pm and right-justified at 8 characters, with 2 spaces before 'up'.  A figure in
+          #   whole days was written as 3 days, 0 min.
+          # By version 2.0.17 the time of day was rewritten in 24hr time with seconds, right-justified at 9 characters.
+          # By version 3.2.7 one of the spaces before 'up' had been removed.
+          test_cases = [
+            ['  4:42pm  up 1 min(s),  0 users,  load average: 0.95, 0.25, 0.09',                                         1*60],
+            ['13:16  up 58 mins,  2 users,  load average: 0.00, 0.02, 0.05',                                            58*60],
+            ['13:18  up 1 hr,  1 user,  load average: 0.58, 0.23, 0.14',                                      1*60*60        ],
+            [' 10:14pm  up 3 hr(s),  0 users,  load average: 0.00, 0.00, 0.00',                               3*60*60        ],
+            ['14:18  up 2 hrs,  0 users,  load average: 0.33, 0.27, 0.29',                                    2*60*60        ],
+            ['  9:01pm  up  1:47,  0 users,  load average: 0.00, 0.00, 0.00',                                 1*60*60 + 47*60],
+            ['13:19  up  1:01,  1 user,  load average: 0.10, 0.26, 0.21',                                     1*60*60 +  1*60],
+            ['10:49  up 22:31,  0 users,  load average: 0.26, 0.34, 0.27',                                   22*60*60 + 31*60],
+            ['12:18  up 1 day,  0 users,  load average: 0.74, 0.20, 0.10',                      1*24*60*60                   ],
+            ['  2:48pm  up 1 day(s),  0 users,  load average: 0.21, 0.20, 0.17',                1*24*60*60                   ],
+            ['12:18  up 2 days,  0 users,  load average: 0.50, 0.27, 0.16',                     2*24*60*60                   ],
+            ['  1:56pm  up 25 day(s),  2 users,  load average: 0.59, 0.56, 0.50',              25*24*60*60                   ],
+            ['  1:29pm  up 485 days,  0 users,  load average: 0.00, 0.01, 0.01',              485*24*60*60                   ],
+            [' 18:11:24  up 69 days, 0 min,  0 users,  load average: 0.00, 0.00, 0.00',        69*24*60*60                   ],
+            ['12:19  up 1 day, 1 min,  0 users,  load average: 0.07, 0.16, 0.13',               1*24*60*60            +  1*60],
+            ['  3:23pm  up 25 day(s), 27 min(s),  2 users,  load average: 0.49, 0.45, 0.46',   25*24*60*60            + 27*60],
+            ['  02:42PM   up 1 day, 39 mins,  0 users,  load average: 1.49, 1.74, 1.80',        1*24*60*60            + 39*60],
+            [' 18:13:13  up 245 days, 44 min,  1 user,  load average: 0.00, 0.00, 0.00',      245*24*60*60            + 44*60],
+            ['  6:09pm  up 350 days, 2 min,  1 user,  load average: 0.02, 0.03, 0.00',        350*24*60*60            +  2*60],
+            ['  1:07pm  up 174 day(s), 16 hr(s),  0 users,  load average: 0.05, 0.04, 0.03',  174*24*60*60 + 16*60*60        ],
+            ['  02:34PM   up 621 days, 18 hrs,  0 users,  load average: 2.67, 2.52, 2.56',    621*24*60*60 + 18*60*60        ],
+            ['  3:30am  up 108 days, 1 hr,  31 users,  load average: 0.39, 0.40, 0.41',       108*24*60*60 +  1*60*60        ],
+            ['13:18  up 1 day, 1 hr,  0 users,  load average: 0.78, 0.33, 0.18',                1*24*60*60 +  1*60*60        ],
+            ['14:18  up 1 day, 2 hrs,  0 users,  load average: 1.17, 0.48, 0.41',               1*24*60*60 +  2*60*60        ],
+            ['15:56  up 152 days, 17 hrs,  0 users,  load average: 0.01, 0.06, 0.07',         152*24*60*60 + 17*60*60        ],
+            ['  5:37pm  up 25 days, 21:00,  0 users,  load average: 0.01, 0.02, 0.00',         25*24*60*60 + 21*60*60        ],
+            ['  8:59pm  up 94 day(s),  3:17,  46 users,  load average: 0.66, 0.67, 0.70',      94*24*60*60 +  3*60*60 + 17*60],
+            ['  3:01pm  up 4496 day(s), 21:19,  32 users,  load average: 0.61, 0.62, 0.62',  4496*24*60*60 + 21*60*60 + 19*60],
+            ['  02:42PM   up 41 days,   2:38,  0 users,  load average: 0.38, 0.70, 0.55',      41*24*60*60 +  2*60*60 + 38*60],
+            [' 18:13:29  up 25 days, 21:36,  0 users,  load average: 0.00, 0.00, 0.00',        25*24*60*60 + 21*60*60 + 36*60],
+            [' 13:36:05 up 118 days,  1:15,  1 user,  load average: 0.00, 0.00, 0.00',        118*24*60*60 +  1*60*60 + 15*60]
+          ]
 
-          it "should use 'who -b'" do
-            who_b_output_file = my_fixture('who_b_boottime') # Aug 1 14:13
-            Facter::Util::Uptime.stubs(:uptime_who_cmd).returns("cat \"#{who_b_output_file}\"")
-            Time.stubs(:now).returns Time.parse("Aug 01 15:13") # one hour later
-            Facter::Util::Uptime.get_uptime_seconds_unix.should == 60 * 60
+          test_cases.each do |uptime, expected|
+            it "should return #{expected} for #{uptime}" do
+              Facter::Util::Resolution.stubs(:exec).with('uptime 2>/dev/null').returns(uptime)
+              Facter.fact(:uptime_seconds).value.should == expected
+            end
           end
 
-          describe "nor is 'who -b'" do
+          describe "nor is 'uptime' command" do
             before :each do
-              Facter::Util::Uptime.stubs(:uptime_who_cmd).returns("cat \"#{@nonexistent_file}\"")
+              Facter::Util::Uptime.stubs(:uptime_executable_cmd).returns("cat \"#{@nonexistent_file}\"")
             end
 
             it "should return nil" do

data/spec/unit/util/virtual_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby
 
 require 'spec_helper'
 require 'facter/util/virtual'

data/spec/unit/util/vlans_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby
 
 require 'spec_helper'
 require 'facter/util/vlans'

data/spec/unit/util/wmi_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby
 
 require 'spec_helper'
 require 'facter/util/wmi'

data/spec/unit/util/xendomains_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby
 
 require 'spec_helper'
 require 'facter/util/xendomains'

data/spec/unit/virtual_spec.rb

@@ -1,11 +1,11 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby
 
 require 'spec_helper'
 require 'facter/util/virtual'
 require 'facter/util/macosx'
 
 describe "Virtual fact" do
-  before do
+  before(:each) do
     Facter::Util::Virtual.stubs(:zone?).returns(false)
     Facter::Util::Virtual.stubs(:openvz?).returns(false)
     Facter::Util::Virtual.stubs(:vserver?).returns(false)
@@ -13,6 +13,7 @@ describe "Virtual fact" do
     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(:virt_what).returns(nil)
   end
 
   it "should be zone on Solaris when a zone" do
@@ -31,16 +32,16 @@ describe "Virtual fact" do
   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
@@ -70,26 +71,25 @@ describe "Virtual fact" do
   end
 
   describe "on Linux" do
-
-    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)
+    before(:each) 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 2>/dev/null" do
       Facter.fact(:kernel).stubs(:value).returns("Linux")
-      Facter::Util::Resolution.stubs(:exec).with('lspci 2>/dev/null').returns("01:00.0 VGA compatible controller: Unknown device 1ab8:4005")
+      Facter::Util::Virtual.stubs(: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 2>/dev/null" do
       Facter.fact(:kernel).stubs(:value).returns("Linux")
-      Facter::Util::Resolution.stubs(:exec).with('lspci 2>/dev/null').returns("01:00.0 VGA compatible controller: Parallels Display Adapter")
+      Facter::Util::Virtual.stubs(:lspci).returns("01:00.0 VGA compatible controller: Parallels Display Adapter")
       Facter.fact(:virtual).value.should == "parallels"
     end
 
@@ -170,8 +170,8 @@ describe "Virtual fact" do
       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.stubs(:exec).with("vmware -v").returns false
@@ -234,32 +234,64 @@ describe "Virtual fact" do
       Facter.fact(:virtual).value.should == "xenhvm"
     end
   end
+
+  describe "with the virt-what command available (#8210)" do
+    describe "when the output of virt-what disagrees with lower weight facts" do
+      virt_what_map = {
+        'xen-hvm'  => 'xenhvm',
+        'xen-dom0' => 'xen0',
+        'xen-domU' => 'xenu',
+        'ibm_systemz' => 'zlinux',
+      }
+
+      virt_what_map.each do |input,output|
+        it "maps #{input} to #{output}" do
+          Facter::Util::Virtual.expects(:virt_what).returns(input)
+          Facter.value(:virtual).should == output
+        end
+      end
+    end
+
+    describe "arbitrary outputs of virt-what" do
+      it "returns the last line output from virt-what" do
+        Facter::Util::Virtual.expects(:virt_what).returns("one\ntwo\nthree space\n")
+        Facter.value(:virtual).should == "three space"
+      end
+    end
+
+    describe "when virt-what returns linux_vserver" do
+      it "delegates to Facter::Util::Virtual.vserver_type" do
+        Facter::Util::Virtual.expects(:virt_what).returns("linux_vserver")
+        Facter::Util::Virtual.expects(:vserver_type).returns("fake_vserver_type")
+        Facter.value(:virtual).should == "fake_vserver_type"
+      end
+    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"
+    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"
+    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"
+    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"
+    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