facter 1.7.6 → 2.0.1.rc1

data/spec/unit/util/solaris_zones_spec.rb

@@ -47,7 +47,7 @@ describe Facter::Util::SolarisZones do
 
   describe '#refresh' do
     it 'executes the zoneadm_cmd' do
-      Facter::Util::Resolution.expects(:exec).with(subject.zoneadm_cmd).returns(zone_list)
+      Facter::Core::Execution.expects(:exec).with(subject.zoneadm_cmd).returns(zone_list)
       subject.refresh
     end
   end
@@ -69,7 +69,7 @@ describe Facter::Util::SolarisZones do
       it 'uses a single read of the system information for all of the dynamically generated zone facts' do
         given_initial_zone_facts # <= single read happens here
 
-        Facter::Util::Resolution.expects(:exec).never
+        Facter::Core::Execution.expects(:exec).never
         Facter.fact(:zone_zoneA_id).value
         Facter.fact(:zone_local_id).value
       end
@@ -101,7 +101,7 @@ describe Facter::Util::SolarisZones do
         given_initial_zone_facts
         when_facts_have_been_resolved_then_flushed
 
-        Facter::Util::Resolution.expects(:exec).once.returns(zone_list2)
+        Facter::Core::Execution.expects(:exec).once.returns(zone_list2)
         Facter.fact(:zones).value
         Facter.fact(:zone_zoneA_id).value
         Facter.fact(:zone_local_id).value
@@ -111,7 +111,7 @@ describe Facter::Util::SolarisZones do
   end
 
   def given_initial_zone_facts
-    Facter::Util::Resolution.stubs(:exec).
+    Facter::Core::Execution.stubs(:exec).
       with(subject.zoneadm_cmd).
       returns(zone_list)
     described_class.add_facts
@@ -121,7 +121,7 @@ describe Facter::Util::SolarisZones do
     Facter.fact(:zones).value
     Facter.fact(:zone_zoneA_id).value
     Facter.fact(:zone_local_id).value
-    Facter::Util::Resolution.stubs(:exec).returns(zone_list2)
+    Facter::Core::Execution.stubs(:exec).returns(zone_list2)
     Facter.flush
   end
 end

data/spec/unit/util/uptime_spec.rb

@@ -99,7 +99,7 @@ describe Facter::Util::Uptime do
 
           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::Core::Execution.stubs(:exec).with('uptime 2>/dev/null').returns(uptime)
               Facter.fact(:uptime_seconds).value.should == expected
             end
           end

data/spec/unit/util/values_spec.rb

@@ -0,0 +1,131 @@
+require 'spec_helper'
+require 'facter/util/values'
+
+describe Facter::Util::Values do
+  describe 'deep_freeze' do
+    it "it dups and freezes strings" do
+      input = "hi"
+      output = described_class.deep_freeze(input)
+      expect(input).to_not be_frozen
+      expect(output).to be_frozen
+    end
+
+    it "freezes arrays and each element in the array" do
+      input = %w[one two three]
+      output = described_class.deep_freeze(input)
+
+      input.each { |entry| expect(entry).to_not be_frozen }
+      output.each { |entry| expect(entry).to be_frozen }
+
+      expect(input).to_not be_frozen
+      expect(output).to be_frozen
+    end
+
+    it "freezes hashes and each key and value in the hash" do
+      input = {'one' => 'two', 'three' => 'four'}
+
+      output = described_class.deep_freeze(input)
+
+      input.each_pair do |key, val|
+        # Ruby freezes all string keys, so these will always be frozen
+        expect(key).to be_frozen
+        expect(val).to_not be_frozen
+      end
+
+      output.each_pair do |key, val|
+        expect(key).to be_frozen
+        expect(val).to be_frozen
+      end
+
+      expect(input).to_not be_frozen
+      expect(output).to be_frozen
+    end
+
+    it "raises an error when given a structure that cannot be deeply frozen" do
+      expect {
+        described_class.deep_freeze(Set.new)
+      }.to raise_error(Facter::Util::Values::DeepFreezeError, /Cannot deep freeze.*Set/)
+    end
+  end
+
+  describe 'deep_merge' do
+    it "non-destructively concatenates arrays" do
+      first = %w[foo bar]
+      second = %w[baz quux]
+
+      expect(described_class.deep_merge(first, second)).to eq %w[foo bar baz quux]
+      expect(first).to eq %w[foo bar]
+      expect(second).to eq %w[baz quux]
+    end
+
+    it "returns the left value if the right value is nil" do
+      expect(described_class.deep_merge("left", nil)).to eq "left"
+    end
+
+    it "returns the right value if the left value is nil" do
+      expect(described_class.deep_merge(nil, "right")).to eq "right"
+    end
+
+    it "returns nil if both values are nil" do
+      expect(described_class.deep_merge(nil, nil)).to be_nil
+    end
+
+    describe "with hashes" do
+      it "merges when keys do not overlap" do
+
+        first = {:foo => 'bar'}
+        second = {:baz => 'quux'}
+
+        expect(described_class.deep_merge(first, second)).to eq(:foo => 'bar', :baz => 'quux')
+        expect(first).to eq(:foo => 'bar')
+        expect(second).to eq(:baz => 'quux')
+      end
+
+      it "concatenates arrays when both keys are arrays" do
+        first = {:foo => %w[bar]}
+        second = {:foo => %w[baz quux]}
+
+        expect(described_class.deep_merge(first, second)).to eq(:foo => %w[bar baz quux])
+        expect(first).to eq(:foo => %w[bar])
+        expect(second).to eq(:foo => %w[baz quux])
+      end
+
+      it "merges hashes when both keys are hashes" do
+        first = {:foo => {:pb => 'lead', :ag => 'silver'}}
+        second = {:foo => {:au => 'gold', :na => 'sodium'}}
+
+        expect(described_class.deep_merge(first, second)).to eq(
+          :foo => {
+            :pb => 'lead',
+            :ag => 'silver',
+            :au => 'gold',
+            :na => 'sodium'
+          }
+        )
+      end
+
+      it "prints the data structure path if an error is raised" do
+        first = {:foo => {:bar => {:baz => {:quux => true}}}}
+        second = {:foo => {:bar => {:baz => {:quux => false}}}}
+
+        expect {
+          described_class.deep_merge(first, second)
+        }.to raise_error(Facter::Util::Values::DeepMergeError, /Cannot merge .*at .*foo.*bar.*baz.*quux/)
+      end
+    end
+
+    describe "with unmergable scalar values" do
+      [
+        [true, false],
+        [1, 2],
+        ['up', 'down']
+      ].each do |(left, right)|
+        it "raises an error when merging #{left}:#{left.class} and #{right}:#{right.class}" do
+          expect {
+            described_class.deep_merge(left, right)
+          }.to raise_error(Facter::Util::Values::DeepMergeError, /Cannot merge #{left.inspect}:#{left.class} and #{right.inspect}:#{right.class}/)
+        end
+      end
+    end
+  end
+end

data/spec/unit/util/virtual_spec.rb

@@ -30,31 +30,31 @@ describe Facter::Util::Virtual do
   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::Core::Execution.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::Core::Execution.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::Core::Execution.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::Core::Execution.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::Core::Execution.stubs(:exec).with("/sbin/zonename").returns("global")
     Facter::Util::Virtual.should_not be_zone
   end
 
@@ -91,7 +91,7 @@ describe Facter::Util::Virtual do
 
   it "should identify kvm" do
     Facter::Util::Virtual.stubs(:kvm?).returns(true)
-    Facter::Util::Resolution.stubs(:exec).with('dmidecode 2> /dev/null').returns("something")
+    Facter::Core::Execution.stubs(:exec).with('dmidecode 2> /dev/null').returns("something")
     Facter::Util::Virtual.kvm_type().should == "kvm"
   end
 
@@ -202,38 +202,38 @@ describe Facter::Util::Virtual do
   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::Core::Execution.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 detect kvm on OpenBSD" do
     FileTest.stubs(:exists?).with("/proc/cpuinfo").returns(false)
     Facter.fact(:kernel).stubs(:value).returns("OpenBSD")
-    Facter::Util::Resolution.stubs(:exec).with("/sbin/sysctl -n hw.model").returns('QEMU Virtual CPU version (cpu64-rhel6) ("AuthenticAMD" 686-class, 512KB L2 cache)')
+    Facter::Core::Execution.stubs(:exec).with("/sbin/sysctl -n hw.model").returns('QEMU Virtual CPU version (cpu64-rhel6) ("AuthenticAMD" 686-class, 512KB L2 cache)')
     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::Core::Execution.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::Core::Execution.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::Core::Execution.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::Core::Execution.stubs(:exec).with("/usr/bin/getconf MACHINE_MODEL").returns('ia64 hp server rx660')
     Facter::Util::Virtual.should_not be_hpvm
   end
 
@@ -263,8 +263,8 @@ describe Facter::Util::Virtual do
   shared_examples_for "virt-what" do |kernel, path, null_device|
     before(:each) do
       Facter.fact(:kernel).stubs(:value).returns(kernel)
-      Facter::Util::Resolution.expects(:which).with("virt-what").returns(path)
-      Facter::Util::Resolution.expects(:exec).with("#{path} 2>#{null_device}")
+      Facter::Core::Execution.expects(:which).with("virt-what").returns(path)
+      Facter::Core::Execution.expects(:exec).with("#{path} 2>#{null_device}")
     end
 
     it "on #{kernel} virt-what is at #{path} and stderr is sent to #{null_device}" do
@@ -278,8 +278,8 @@ describe Facter::Util::Virtual do
     it "should strip out warnings on stdout from virt-what" do
       virt_what_warning = "virt-what: this script must be run as root"
       Facter.fact(:kernel).stubs(:value).returns('linux')
-      Facter::Util::Resolution.expects(:which).with('virt-what').returns "/usr/bin/virt-what"
-      Facter::Util::Resolution.expects(:exec).with('/usr/bin/virt-what 2>/dev/null').returns virt_what_warning
+      Facter::Core::Execution.expects(:which).with('virt-what').returns "/usr/bin/virt-what"
+      Facter::Core::Execution.expects(:exec).with('/usr/bin/virt-what 2>/dev/null').returns virt_what_warning
       Facter::Util::Virtual.virt_what.should_not match /^virt-what: /
     end
   end

data/spec/unit/util/xendomains_spec.rb

@@ -7,13 +7,13 @@ describe Facter::Util::Xendomains do
   describe ".get_domains" do
     it "should return a list of running Xen Domains on Xen0" do
       xen0_domains = my_fixture_read("xendomains")
-      Facter::Util::Resolution.stubs(:exec).with('/usr/sbin/xm list 2>/dev/null').returns(xen0_domains)
+      Facter::Core::Execution.stubs(:exec).with('/usr/sbin/xm list 2>/dev/null').returns(xen0_domains)
       Facter::Util::Xendomains.get_domains.should == %{web01,mailserver}
     end
 
     describe "when xm list isn't executable" do
       it "should be nil" do
-        Facter::Util::Resolution.stubs(:exec).with('/usr/sbin/xm list 2>/dev/null').returns(nil)
+        Facter::Core::Execution.stubs(:exec).with('/usr/sbin/xm list 2>/dev/null').returns(nil)
         Facter::Util::Xendomains.get_domains.should == nil
       end
     end

data/spec/unit/virtual_spec.rb

@@ -78,7 +78,7 @@ describe "Virtual fact" do
       Facter.fact(:kernel).stubs(:value).returns("Linux")
       Facter.fact(:operatingsystem).stubs(:value).returns("Linux")
 
-      Facter::Util::Resolution.stubs(:exec).with("vmware -v").returns false
+      Facter::Core::Execution.stubs(:exec).with("vmware -v").returns false
 
       FileTest.stubs(:exists?).with("/proc/sys/xen").returns false
       FileTest.stubs(:exists?).with("/sys/bus/xen").returns false
@@ -97,18 +97,18 @@ describe "Virtual fact" do
     end
 
     it "should be vmware with VMware vendor name from lspci 2>/dev/null" do
-      Facter::Util::Resolution.stubs(:exec).with('lspci 2>/dev/null').returns("00:0f.0 VGA compatible controller: VMware Inc [VMware SVGA II] PCI Display Adapter")
+      Facter::Core::Execution.stubs(:exec).with('lspci 2>/dev/null').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 2>/dev/null" do
-      Facter::Util::Resolution.stubs(:exec).with('lspci 2>/dev/null').returns("00:02.0 VGA compatible controller: InnoTek Systemberatung GmbH VirtualBox Graphics Adapter")
+      Facter::Core::Execution.stubs(:exec).with('lspci 2>/dev/null').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::Util::Resolution.stubs(:exec).with('lspci 2>/dev/null').returns(nil)
-      Facter::Util::Resolution.stubs(:exec).with('dmidecode 2> /dev/null').returns("On Board Device 1 Information\nType: Video\nStatus: Disabled\nDescription: VMware SVGA II")
+      Facter::Core::Execution.stubs(:exec).with('lspci 2>/dev/null').returns(nil)
+      Facter::Core::Execution.stubs(:exec).with('dmidecode 2> /dev/null').returns("On Board Device 1 Information\nType: Video\nStatus: Disabled\nDescription: VMware SVGA II")
       Facter.fact(:virtual).value.should == "vmware"
     end
 
@@ -128,50 +128,50 @@ describe "Virtual fact" do
     end
 
     it "should be xenhvm with Xen HVM vendor name from lspci 2>/dev/null" do
-      Facter::Util::Resolution.stubs(:exec).with('lspci 2>/dev/null').returns("00:03.0 Unassigned class [ff80]: XenSource, Inc. Xen Platform Device (rev 01)")
+      Facter::Core::Execution.stubs(:exec).with('lspci 2>/dev/null').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::Util::Resolution.stubs(:exec).with('lspci 2>/dev/null').returns(nil)
-      Facter::Util::Resolution.stubs(:exec).with('dmidecode 2> /dev/null').returns("System Information\nManufacturer: Xen\nProduct Name: HVM domU")
+      Facter::Core::Execution.stubs(:exec).with('lspci 2>/dev/null').returns(nil)
+      Facter::Core::Execution.stubs(:exec).with('dmidecode 2> /dev/null').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::Util::Resolution.stubs(:exec).with('lspci 2>/dev/null').returns(nil)
-      Facter::Util::Resolution.stubs(:exec).with('dmidecode 2> /dev/null').returns("On Board Device Information\nType: Video\nStatus: Disabled\nDescription: Parallels Video Adapter")
+      Facter::Core::Execution.stubs(:exec).with('lspci 2>/dev/null').returns(nil)
+      Facter::Core::Execution.stubs(:exec).with('dmidecode 2> /dev/null').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::Util::Resolution.stubs(:exec).with('lspci 2>/dev/null').returns(nil)
-      Facter::Util::Resolution.stubs(:exec).with('dmidecode 2> /dev/null').returns("BIOS Information\nVendor: innotek GmbH\nVersion: VirtualBox\n\nSystem Information\nManufacturer: innotek GmbH\nProduct Name: VirtualBox\nFamily: Virtual Machine")
+      Facter::Core::Execution.stubs(:exec).with('lspci 2>/dev/null').returns(nil)
+      Facter::Core::Execution.stubs(:exec).with('dmidecode 2> /dev/null').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 rhev with RHEV Hypervisor product name from dmidecode" do
       Facter.fact(:kernel).stubs(:value).returns("Linux")
-      Facter::Util::Resolution.stubs(:exec).with('lspci 2>/dev/null').returns(nil)
-      Facter::Util::Resolution.stubs(:exec).with('dmidecode 2> /dev/null').returns("Product Name: RHEV Hypervisor")
+      Facter::Core::Execution.stubs(:exec).with('lspci 2>/dev/null').returns(nil)
+      Facter::Core::Execution.stubs(:exec).with('dmidecode 2> /dev/null').returns("Product Name: RHEV Hypervisor")
       Facter.fact(:virtual).value.should == "rhev"
     end
 
     it "should be ovirt with oVirt Node product name from dmidecode" do
       Facter.fact(:kernel).stubs(:value).returns("Linux")
-      Facter::Util::Resolution.stubs(:exec).with('lspci 2>/dev/null').returns(nil)
-      Facter::Util::Resolution.stubs(:exec).with('dmidecode 2> /dev/null').returns("Product Name: oVirt Node")
+      Facter::Core::Execution.stubs(:exec).with('lspci 2>/dev/null').returns(nil)
+      Facter::Core::Execution.stubs(:exec).with('dmidecode 2> /dev/null').returns("Product Name: oVirt Node")
       Facter.fact(:virtual).value.should == "ovirt"
     end
 
     it "should be hyperv with Microsoft vendor name from lspci 2>/dev/null" do
-      Facter::Util::Resolution.stubs(:exec).with('lspci 2>/dev/null').returns("00:08.0 VGA compatible controller: Microsoft Corporation Hyper-V virtual VGA")
+      Facter::Core::Execution.stubs(:exec).with('lspci 2>/dev/null').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::Util::Resolution.stubs(:exec).with('lspci 2>/dev/null').returns(nil)
-      Facter::Util::Resolution.stubs(:exec).with('dmidecode 2> /dev/null').returns("System Information\nManufacturer: Microsoft Corporation\nProduct Name: Virtual Machine")
+      Facter::Core::Execution.stubs(:exec).with('lspci 2>/dev/null').returns(nil)
+      Facter::Core::Execution.stubs(:exec).with('dmidecode 2> /dev/null').returns("System Information\nManufacturer: Microsoft Corporation\nProduct Name: Virtual Machine")
       Facter.fact(:virtual).value.should == "hyperv"
     end
 
@@ -186,7 +186,7 @@ describe "Virtual fact" do
         end
 
         it "should be gce with gce vendor name from lspci 2>/dev/null" do
-          Facter::Util::Resolution.stubs(:exec).with('lspci 2>/dev/null').returns("00:05.0 Class 8007: Google, Inc. Device 6442")
+          Facter::Core::Execution.stubs(:exec).with('lspci 2>/dev/null').returns("00:05.0 Class 8007: Google, Inc. Device 6442")
           Facter.fact(:virtual).value.should == "gce"
         end
       end
@@ -207,69 +207,69 @@ describe "Virtual fact" do
     end
 
     it "(#20236) is vmware when dmidecode contains vmware and lspci returns insufficient information" do
-      Facter::Util::Resolution.stubs(:exec).with('lspci 2>/dev/null').returns("garbage\ninformation\n")
-      Facter::Util::Resolution.stubs(:exec).with('dmidecode 2> /dev/null').returns("On Board Device 1 Information\nType: Video\nStatus: Disabled\nDescription: VMware SVGA II")
+      Facter::Core::Execution.stubs(:exec).with('lspci 2>/dev/null').returns("garbage\ninformation\n")
+      Facter::Core::Execution.stubs(:exec).with('dmidecode 2> /dev/null').returns("On Board Device 1 Information\nType: Video\nStatus: Disabled\nDescription: VMware SVGA II")
       Facter.fact(:virtual).value.should eq("vmware")
     end
   end
 
   describe "on Solaris" do
     before(:each) do
-      Facter::Util::Resolution.stubs(:exec).with("vmware -v").returns false
+      Facter::Core::Execution.stubs(:exec).with("vmware -v").returns false
       Facter.fact(:kernel).stubs(:value).returns("SunOS")
     end
 
     it "should be vmware with VMWare vendor name from prtdiag" do
       Facter.fact(:hardwaremodel).stubs(:value).returns(nil)
-      Facter::Util::Resolution.stubs(:exec).with('lspci 2>/dev/null').returns(nil)
-      Facter::Util::Resolution.stubs(:exec).with('dmidecode 2> /dev/null').returns(nil)
-      Facter::Util::Resolution.stubs(:exec).with('prtdiag').returns("System Configuration: VMware, Inc. VMware Virtual Platform")
+      Facter::Core::Execution.stubs(:exec).with('lspci 2>/dev/null').returns(nil)
+      Facter::Core::Execution.stubs(:exec).with('dmidecode 2> /dev/null').returns(nil)
+      Facter::Core::Execution.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(:hardwaremodel).stubs(:value).returns(nil)
-      Facter::Util::Resolution.stubs(:exec).with('lspci 2>/dev/null').returns(nil)
-      Facter::Util::Resolution.stubs(:exec).with('dmidecode 2> /dev/null').returns(nil)
-      Facter::Util::Resolution.stubs(:exec).with('prtdiag').returns("System Configuration: Parallels Virtual Platform")
+      Facter::Core::Execution.stubs(:exec).with('lspci 2>/dev/null').returns(nil)
+      Facter::Core::Execution.stubs(:exec).with('dmidecode 2> /dev/null').returns(nil)
+      Facter::Core::Execution.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(:hardwaremodel).stubs(:value).returns(nil)
-      Facter::Util::Resolution.stubs(:exec).with('lspci 2>/dev/null').returns(nil)
-      Facter::Util::Resolution.stubs(:exec).with('dmidecode 2> /dev/null').returns(nil)
-      Facter::Util::Resolution.stubs(:exec).with('prtdiag').returns("System Configuration: innotek GmbH VirtualBox")
+      Facter::Core::Execution.stubs(:exec).with('lspci 2>/dev/null').returns(nil)
+      Facter::Core::Execution.stubs(:exec).with('dmidecode 2> /dev/null').returns(nil)
+      Facter::Core::Execution.stubs(:exec).with('prtdiag').returns("System Configuration: innotek GmbH VirtualBox")
       Facter.fact(:virtual).value.should == "virtualbox"
     end
   end
 
   describe "on OpenBSD" do
     before do
-      Facter::Util::Resolution.stubs(:exec).with("vmware -v").returns false
+      Facter::Core::Execution.stubs(:exec).with("vmware -v").returns false
       Facter.fact(:kernel).stubs(:value).returns("OpenBSD")
       Facter.fact(:hardwaremodel).stubs(:value).returns(nil)
-      Facter::Util::Resolution.stubs(:exec).with('lspci 2>/dev/null').returns(nil)
-      Facter::Util::Resolution.stubs(:exec).with('dmidecode 2> /dev/null').returns(nil)
+      Facter::Core::Execution.stubs(:exec).with('lspci 2>/dev/null').returns(nil)
+      Facter::Core::Execution.stubs(:exec).with('dmidecode 2> /dev/null').returns(nil)
     end
 
     it "should be parallels with Parallels product name from sysctl" do
-      Facter::Util::Resolution.stubs(:exec).with('sysctl -n hw.product 2>/dev/null').returns("Parallels Virtual Platform")
+      Facter::Core::Execution.stubs(:exec).with('sysctl -n hw.product 2>/dev/null').returns("Parallels Virtual Platform")
       Facter.fact(:virtual).value.should == "parallels"
     end
 
     it "should be vmware with VMware product name from sysctl" do
-      Facter::Util::Resolution.stubs(:exec).with('sysctl -n hw.product 2>/dev/null').returns("VMware Virtual Platform")
+      Facter::Core::Execution.stubs(:exec).with('sysctl -n hw.product 2>/dev/null').returns("VMware Virtual Platform")
       Facter.fact(:virtual).value.should == "vmware"
     end
 
     it "should be virtualbox with VirtualBox product name from sysctl" do
-      Facter::Util::Resolution.stubs(:exec).with('sysctl -n hw.product 2>/dev/null').returns("VirtualBox")
+      Facter::Core::Execution.stubs(:exec).with('sysctl -n hw.product 2>/dev/null').returns("VirtualBox")
       Facter.fact(:virtual).value.should == "virtualbox"
     end
 
     it "should be xenhvm with Xen HVM product name from sysctl" do
-      Facter::Util::Resolution.stubs(:exec).with('sysctl -n hw.product 2>/dev/null').returns("HVM domU")
+      Facter::Core::Execution.stubs(:exec).with('sysctl -n hw.product 2>/dev/null').returns("HVM domU")
       Facter.fact(:virtual).value.should == "xenhvm"
     end
   end