facter 1.7.6 → 2.0.1.rc1

data/spec/unit/filesystems_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 
 require 'spec_helper'
 
@@ -14,7 +14,7 @@ describe 'Filesystem facts' do
     before :each do
       Facter.fact(:kernel).stubs(:value).returns('Linux')
       fixture_data = my_fixture_read('linux')
-      Facter::Util::Resolution.expects(:exec) \
+      Facter::Core::Execution.expects(:exec) \
         .with('cat /proc/filesystems 2> /dev/null').returns(fixture_data)
       Facter.collection.internal_loader.load(:filesystems)
     end

data/spec/unit/hardwareisa_spec.rb

@@ -6,35 +6,35 @@ require 'facter'
 describe "Hardwareisa fact" do
   it "should match uname -p on Linux" do
     Facter.fact(:kernel).stubs(:value).returns("Linux")
-    Facter::Util::Resolution.stubs(:exec).with("uname -p").returns("Inky")
+    Facter::Core::Execution.stubs(:exec).with("uname -p").returns("Inky")
 
     Facter.fact(:hardwareisa).value.should == "Inky"
   end
 
   it "should match uname -p on Darwin" do
     Facter.fact(:kernel).stubs(:value).returns("Darwin")
-    Facter::Util::Resolution.stubs(:exec).with("uname -p").returns("Blinky")
+    Facter::Core::Execution.stubs(:exec).with("uname -p").returns("Blinky")
 
     Facter.fact(:hardwareisa).value.should == "Blinky"
   end
 
   it "should match uname -p on SunOS" do
     Facter.fact(:kernel).stubs(:value).returns("SunOS")
-    Facter::Util::Resolution.stubs(:exec).with("uname -p").returns("Pinky")
+    Facter::Core::Execution.stubs(:exec).with("uname -p").returns("Pinky")
 
     Facter.fact(:hardwareisa).value.should == "Pinky"
   end
 
   it "should match uname -p on FreeBSD" do
     Facter.fact(:kernel).stubs(:value).returns("FreeBSD")
-    Facter::Util::Resolution.stubs(:exec).with("uname -p").returns("Clyde")
+    Facter::Core::Execution.stubs(:exec).with("uname -p").returns("Clyde")
 
     Facter.fact(:hardwareisa).value.should == "Clyde"
   end
 
   it "should match uname -m on HP-UX" do
     Facter.fact(:kernel).stubs(:value).returns("HP-UX")
-    Facter::Util::Resolution.stubs(:exec).with("uname -m").returns("Pac-Man")
+    Facter::Core::Execution.stubs(:exec).with("uname -m").returns("Pac-Man")
 
     Facter.fact(:hardwareisa).value.should == "Pac-Man"
   end

data/spec/unit/hardwaremodel_spec.rb

@@ -6,7 +6,7 @@ require 'facter'
 describe "Hardwaremodel fact" do
   it "should match uname -m by default" do
     Facter.fact(:kernel).stubs(:value).returns("Darwin")
-    Facter::Util::Resolution.stubs(:exec).with("uname -m").returns("Inky")
+    Facter::Core::Execution.stubs(:exec).with("uname -m").returns("Inky")
 
     Facter.fact(:hardwaremodel).value.should == "Inky"
   end

data/spec/unit/hostname_spec.rb

@@ -11,17 +11,17 @@ describe "Hostname facts" do
     end
 
     it "should use the hostname command" do
-      Facter::Util::Resolution.expects(:exec).with('hostname').at_least_once
+      Facter::Core::Execution.expects(:exec).with('hostname').at_least_once
       Facter.fact(:hostname).value.should be_nil
     end
 
     it "should use hostname as the fact if unqualified" do
-      Facter::Util::Resolution.stubs(:exec).with('hostname').returns('host1')
+      Facter::Core::Execution.stubs(:exec).with('hostname').returns('host1')
       Facter.fact(:hostname).value.should == "host1"
     end
 
     it "should truncate the domain name if qualified" do
-      Facter::Util::Resolution.stubs(:exec).with('hostname').returns('host1.example.com')
+      Facter::Core::Execution.stubs(:exec).with('hostname').returns('host1.example.com')
       Facter.fact(:hostname).value.should == "host1"
     end
   end
@@ -33,7 +33,7 @@ describe "Hostname facts" do
     end
 
     it "should use scutil to get the hostname" do
-      Facter::Util::Resolution.expects(:exec).with('/usr/sbin/scutil --get LocalHostName').returns("host1")
+      Facter::Core::Execution.expects(:exec).with('/usr/sbin/scutil --get LocalHostName').returns("host1")
       Facter.fact(:hostname).value.should == "host1"
     end
   end

data/spec/unit/id_spec.rb

@@ -12,7 +12,7 @@ describe "id fact" do
       it "should return the current user" do
         given_a_configuration_of(:is_windows => k == 'windows')
         Facter.fact(:kernel).stubs(:value).returns(k)
-        Facter::Util::Resolution.expects(:exec).once.with('whoami').returns 'bar'
+        Facter::Core::Execution.expects(:exec).once.with('whoami').returns 'bar'
 
         Facter.fact(:id).value.should == 'bar'
       end
@@ -21,8 +21,8 @@ describe "id fact" do
 
   it "should return the current user on Solaris" do
     given_a_configuration_of(:is_windows => false)
-    Facter::Util::Resolution.stubs(:exec).with('uname -s').returns('SunOS')
-    Facter::Util::Resolution.expects(:exec).once.with('/usr/xpg4/bin/id -un').returns 'bar'
+    Facter::Core::Execution.stubs(:exec).with('uname -s').returns('SunOS')
+    Facter::Core::Execution.expects(:exec).once.with('/usr/xpg4/bin/id -un').returns 'bar'
 
     Facter.fact(:id).value.should == 'bar'
   end

data/spec/unit/interfaces_spec.rb

@@ -31,6 +31,16 @@ describe "Per Interface IP facts" do
     Facter::Util::IP.stubs(:get_interfaces).returns ["Local Area Connection", "Loopback \"Pseudo-Interface\" (#1)"]
     Facter.fact(:interfaces).value.should == %{Local_Area_Connection,Loopback__Pseudo_Interface____1_}
   end
+
+  it "should properly format a mac address" do
+    Facter::Util::IP.stubs(:get_interfaces).returns ["net0"]
+    Facter::Util::IP.stubs(:get_interface_value).returns "0:12:34:56:78:90"
+
+    Facter.collection.internal_loader.load(:interfaces)
+
+    fact = Facter.fact("macaddress_net0".intern)
+    fact.value.should eq("00:12:34:56:78:90")
+  end
 end
 
 describe "Netmask handling on Linux" do

data/spec/unit/ipaddress6_spec.rb

@@ -15,7 +15,7 @@ describe "The IPv6 address fact" do
   end
 
   it "should return ipaddress6 information for Darwin" do
-    Facter::Util::Resolution.stubs(:exec).with('uname -s').returns('Darwin')
+    Facter::Core::Execution.stubs(:exec).with('uname -s').returns('Darwin')
     Facter::Util::IP.stubs(:get_ifconfig).returns("/sbin/ifconfig")
     Facter::Util::IP.stubs(:exec_ifconfig).with(["-a"]).
       returns(ifconfig_fixture('darwin_ifconfig_all_with_multiple_interfaces'))
@@ -24,7 +24,7 @@ describe "The IPv6 address fact" do
   end
 
   it "should return ipaddress6 information for Linux" do
-    Facter::Util::Resolution.stubs(:exec).with('uname -s').returns('Linux')
+    Facter::Core::Execution.stubs(:exec).with('uname -s').returns('Linux')
     Facter::Util::IP.stubs(:get_ifconfig).returns("/sbin/ifconfig")
     Facter::Util::IP.stubs(:exec_ifconfig).with(["2>/dev/null"]).
       returns(ifconfig_fixture('linux_ifconfig_all_with_multiple_interfaces'))
@@ -33,7 +33,7 @@ describe "The IPv6 address fact" do
   end
 
   it "should return ipaddress6 information for Linux with recent net-tools" do
-      Facter::Util::Resolution.stubs(:exec).with('uname -s').returns('Linux')
+      Facter::Core::Execution.stubs(:exec).with('uname -s').returns('Linux')
       Facter::Util::IP.stubs(:get_ifconfig).returns("/sbin/ifconfig")
       Facter::Util::IP.stubs(:exec_ifconfig).with(["2>/dev/null"]).
         returns(ifconfig_fixture('ifconfig_net_tools_1.60.txt'))
@@ -42,7 +42,7 @@ describe "The IPv6 address fact" do
     end
 
   it "should return ipaddress6 information for Solaris" do
-    Facter::Util::Resolution.stubs(:exec).with('uname -s').returns('SunOS')
+    Facter::Core::Execution.stubs(:exec).with('uname -s').returns('SunOS')
     Facter::Util::IP.stubs(:get_ifconfig).returns("/usr/sbin/ifconfig")
     Facter::Util::IP.stubs(:exec_ifconfig).with(["-a"]).
       returns(ifconfig_fixture('sunos_ifconfig_all_with_multiple_interfaces'))

data/spec/unit/ipaddress_spec.rb

@@ -60,7 +60,7 @@ describe "ipaddress fact" do
     context "when you have no active network adapter" do
       it "should return nil if there are no active (or any) network adapters" do
         Facter::Util::WMI.expects(:execquery).with(Facter::Util::IP::Windows::WMI_IP_INFO_QUERY).returns([])
-        Facter::Util::Resolution.stubs(:exec)
+        Facter::Core::Execution.stubs(:exec)
 
         Facter.value(:ipaddress).should == nil
       end

data/spec/unit/kernel_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 
 require 'spec_helper'
 
@@ -16,7 +16,7 @@ describe "Kernel fact" do
   describe "on everything else" do
     it "should return the kernel using 'uname -s'" do
       given_a_configuration_of(:is_windows => false)
-      Facter::Util::Resolution.stubs(:exec).with('uname -s').returns("test_kernel")
+      Facter::Core::Execution.stubs(:exec).with('uname -s').returns("test_kernel")
 
       Facter.fact(:kernel).value.should == 'test_kernel'
     end

data/spec/unit/kernelmajversion_spec.rb

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

data/spec/unit/kernelrelease_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 
 require 'spec_helper'
 
@@ -21,7 +21,7 @@ describe "Kernel release fact" do
   describe "on AIX" do 
     before do 
       Facter.fact(:kernel).stubs(:value).returns("aix")
-      Facter::Util::Resolution.stubs(:exec).with('oslevel -s').returns("test_kernel")
+      Facter::Core::Execution.stubs(:exec).with('oslevel -s').returns("test_kernel")
     end 
     
     it "should return the kernel release" do 
@@ -32,7 +32,7 @@ describe "Kernel release fact" do
   describe "on HP-UX" do
     before do
       Facter.fact(:kernel).stubs(:value).returns("hp-ux") 
-      Facter::Util::Resolution.stubs(:exec).with('uname -r').returns("B.11.31")
+      Facter::Core::Execution.stubs(:exec).with('uname -r').returns("B.11.31")
     end 
     
     it "should remove preceding letters" do
@@ -43,7 +43,7 @@ describe "Kernel release fact" do
   describe "on everything else" do 
     before do
       Facter.fact(:kernel).stubs(:value).returns("linux")
-      Facter::Util::Resolution.stubs(:exec).with('uname -r').returns("test_kernel")
+      Facter::Core::Execution.stubs(:exec).with('uname -r').returns("test_kernel")
     end 
     
     it "should return the kernel release" do

data/spec/unit/kernelversion_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 
 require 'spec_helper'
 
@@ -7,7 +7,7 @@ describe "Kernel version fact" do
   describe "on Solaris/Sun OS" do
     before do
       Facter.fact(:kernel).stubs(:value).returns('sunos')
-      Facter::Util::Resolution.stubs(:exec).with('uname -v').returns("1.234.5")
+      Facter::Core::Execution.stubs(:exec).with('uname -v').returns("1.234.5")
     end 
     
     it "should return the kernel version using 'uname -v'" do 

data/spec/unit/ldom_spec.rb

@@ -15,7 +15,7 @@ describe "ldom fact" do
     before :each do
       # For virtinfo documentation:
       # http://docs.oracle.com/cd/E23824_01/html/821-1462/virtinfo-1m.html
-      Facter::Util::Resolution.stubs(:exec).with("virtinfo -ap").
+      Facter::Core::Execution.stubs(:exec).with("virtinfo -ap").
         returns(ldom_fixtures('ldom_v1'))
       Facter.collection.internal_loader.load(:ldom)
     end
@@ -63,7 +63,7 @@ describe "ldom fact" do
 
   describe "when running on non ldom hardware" do
     before :each do
-      Facter::Util::Resolution.stubs(:exec).with("virtinfo -ap").returns(nil)
+      Facter::Core::Execution.stubs(:exec).with("virtinfo -ap").returns(nil)
       Facter.collection.internal_loader.load(:ldom)
     end
 

data/spec/unit/lsbdistcodename_spec.rb

@@ -11,12 +11,12 @@ describe "lsbdistcodename fact" do
       end
 
       it "should return the codename through lsb_release -c -s 2>/dev/null" do
-        Facter::Util::Resolution.stubs(:exec).with('lsb_release -c -s 2>/dev/null').returns 'n/a'
+        Facter::Core::Execution.stubs(:exec).with('lsb_release -c -s 2>/dev/null').returns 'n/a'
         Facter.fact(:lsbdistcodename).value.should == 'n/a'
       end
 
       it "should return nil if lsb_release is not installed" do
-        Facter::Util::Resolution.stubs(:exec).with('lsb_release -c -s 2>/dev/null').returns nil
+        Facter::Core::Execution.stubs(:exec).with('lsb_release -c -s 2>/dev/null').returns nil
         Facter.fact(:lsbdistcodename).value.should be_nil
       end
     end

data/spec/unit/lsbdistdescription_spec.rb

@@ -11,12 +11,12 @@ describe "lsbdistdescription fact" do
       end
 
       it "should return the description through lsb_release -d -s 2>/dev/null" do
-        Facter::Util::Resolution.stubs(:exec).with('lsb_release -d -s 2>/dev/null').returns '"Gentoo Base System release 2.1"'
+        Facter::Core::Execution.stubs(:exec).with('lsb_release -d -s 2>/dev/null').returns '"Gentoo Base System release 2.1"'
         Facter.fact(:lsbdistdescription).value.should == 'Gentoo Base System release 2.1'
       end
 
       it "should return nil if lsb_release is not installed" do
-        Facter::Util::Resolution.stubs(:exec).with('lsb_release -d -s 2>/dev/null').returns nil
+        Facter::Core::Execution.stubs(:exec).with('lsb_release -d -s 2>/dev/null').returns nil
         Facter.fact(:lsbdistdescription).value.should be_nil
       end
     end

data/spec/unit/lsbdistid_spec.rb

@@ -11,12 +11,12 @@ describe "lsbdistid fact" do
       end
 
       it "should return the id through lsb_release -i -s 2>/dev/null" do
-        Facter::Util::Resolution.stubs(:exec).with('lsb_release -i -s 2>/dev/null').returns 'Gentoo'
+        Facter::Core::Execution.stubs(:exec).with('lsb_release -i -s 2>/dev/null').returns 'Gentoo'
         Facter.fact(:lsbdistid).value.should == 'Gentoo'
       end
 
       it "should return nil if lsb_release is not installed 2>/dev/null" do
-        Facter::Util::Resolution.stubs(:exec).with('lsb_release -i -s 2>/dev/null').returns nil
+        Facter::Core::Execution.stubs(:exec).with('lsb_release -i -s 2>/dev/null').returns nil
         Facter.fact(:lsbdistid).value.should be_nil
       end
     end

data/spec/unit/lsbdistrelease_spec.rb

@@ -11,12 +11,12 @@ describe "lsbdistrelease fact" do
       end
 
       it "should return the release through lsb_release -r -s 2>/dev/null" do
-        Facter::Util::Resolution.stubs(:exec).with('lsb_release -r -s 2>/dev/null').returns '2.1'
+        Facter::Core::Execution.stubs(:exec).with('lsb_release -r -s 2>/dev/null').returns '2.1'
         Facter.fact(:lsbdistrelease).value.should == '2.1'
       end
 
       it "should return nil if lsb_release is not installed" do
-        Facter::Util::Resolution.stubs(:exec).with('lsb_release -r -s 2>/dev/null').returns nil
+        Facter::Core::Execution.stubs(:exec).with('lsb_release -r -s 2>/dev/null').returns nil
         Facter.fact(:lsbdistrelease).value.should be_nil
       end
     end

data/spec/unit/lsbrelease_spec.rb

@@ -11,12 +11,12 @@ describe "lsbrelease fact" do
       end
 
       it "should return the release through lsb_release -v -s 2>/dev/null" do
-        Facter::Util::Resolution.stubs(:exec).with('lsb_release -v -s 2>/dev/null').returns 'n/a'
+        Facter::Core::Execution.stubs(:exec).with('lsb_release -v -s 2>/dev/null').returns 'n/a'
         Facter.fact(:lsbrelease).value.should == 'n/a'
       end
 
       it "should return nil if lsb_release is not installed" do
-        Facter::Util::Resolution.stubs(:exec).with('lsb_release -v -s 2>/dev/null').returns nil
+        Facter::Core::Execution.stubs(:exec).with('lsb_release -v -s 2>/dev/null').returns nil
         Facter.fact(:lsbrelease).value.should be_nil
       end
     end

data/spec/unit/manufacturer_spec.rb

@@ -112,4 +112,4 @@ End Of Table
     
   end
   
-end
+end

data/spec/unit/memory_spec.rb

@@ -48,7 +48,7 @@ describe "Memory facts" do
     before(:each) do
       Facter.clear
       Facter.fact(:kernel).stubs(:value).returns("Darwin")
-      Facter::Util::Resolution.stubs(:exec).with('sysctl -n hw.memsize').returns('8589934592')
+      Facter::Core::Execution.stubs(:exec).with('sysctl -n hw.memsize').returns('8589934592')
       sample_vm_stat = <<VMSTAT
 Mach Virtual Memory Statistics: (page size of 4096 bytes)
 Pages free:                          28430.
@@ -64,8 +64,8 @@ Pageins:                          13862917.
 Pageouts:                          1384383.
 Object cache: 14 hits of 2619925 lookups (0% hit rate)
 VMSTAT
-      Facter::Util::Resolution.stubs(:exec).with('vm_stat').returns(sample_vm_stat)
-      Facter::Util::Resolution.stubs(:exec).with('sysctl vm.swapusage').returns("vm.swapusage: total = 64.00M  used = 1.00M  free = 63.00M  (encrypted)")
+      Facter::Core::Execution.stubs(:exec).with('vm_stat').returns(sample_vm_stat)
+      Facter::Core::Execution.stubs(:exec).with('sysctl vm.swapusage').returns("vm.swapusage: total = 64.00M  used = 1.00M  free = 63.00M  (encrypted)")
 
       Facter.collection.internal_loader.load(:memory)
     end
@@ -154,7 +154,7 @@ device maj,min total free
 /dev/hd6 10, 2 512MB 508MB
 SWAP
 
-      Facter::Util::Resolution.stubs(:exec).with('swap -l 2>/dev/null').returns(swapusage)
+      Facter::Core::Execution.stubs(:exec).with('swap -l 2>/dev/null').returns(swapusage)
 
       svmon = <<SVMON
 Unit: KB
@@ -168,7 +168,7 @@ pin         1478228           0           0      953852
 in use      4448928           0     5499480
 SVMON
 
-      Facter::Util::Resolution.stubs(:exec).with('/usr/bin/svmon -O unit=KB').returns(svmon)
+      Facter::Core::Execution.stubs(:exec).with('/usr/bin/svmon -O unit=KB').returns(svmon)
 
       Facter.collection.internal_loader.load(:memory)
     end
@@ -222,16 +222,16 @@ SVMON
       Facter.fact(:kernel).stubs(:value).returns("OpenBSD")
 
       swapusage = "total: 148342k bytes allocated = 0k used, 148342k available"
-      Facter::Util::Resolution.stubs(:exec).with('swapctl -s').returns(swapusage)
+      Facter::Core::Execution.stubs(:exec).with('swapctl -s').returns(swapusage)
 
       vmstat = <<EOS
  procs  memory     page          disks  traps      cpu
  r b w  avm   fre  flt  re  pi  po  fr  sr cd0 sd0  int   sys   cs us sy id
  0 0 0  11048  181028   39   0   0   0   0   0   0   1  3  90   17  0  0 100
 EOS
-      Facter::Util::Resolution.stubs(:exec).with('vmstat').returns(vmstat)
+      Facter::Core::Execution.stubs(:exec).with('vmstat').returns(vmstat)
 
-      Facter::Util::Resolution.stubs(:exec).with("sysctl hw.physmem | cut -d'=' -f2").returns('267321344')
+      Facter::Core::Execution.stubs(:exec).with("sysctl hw.physmem | cut -d'=' -f2").returns('267321344')
 
       Facter.collection.internal_loader.load(:memory)
     end
@@ -267,14 +267,14 @@ Memory size: 2048 Megabytes
 System Peripherals (Software Nodes):
 
 PRTCONF
-      Facter::Util::Resolution.stubs(:exec).with('/usr/sbin/prtconf 2>/dev/null').returns sample_prtconf
+      Facter::Core::Execution.stubs(:exec).with('/usr/sbin/prtconf 2>/dev/null').returns sample_prtconf
 
       vmstat_lines = <<VMSTAT
  kthr      memory            page            disk          faults      cpu
  r b w   swap  free  re  mf pi po fr de sr s0 s3 -- --   in   sy   cs us sy id
  0 0 0 1154552 476224 8  19  0  0  0  0  0  0  0  0  0  460  294  236  1  2 97
 VMSTAT
-      Facter::Util::Resolution.stubs(:exec).with('vmstat').returns(vmstat_lines)
+      Facter::Core::Execution.stubs(:exec).with('vmstat').returns(vmstat_lines)
     end
 
     after(:each) do
@@ -287,7 +287,7 @@ VMSTAT
 swapfile             dev  swaplo blocks   free
 /dev/swap           4294967295,4294967295     16 2097136 2097136
 SWAP
-        Facter::Util::Resolution.stubs(:exec).with('/usr/sbin/swap -l 2>/dev/null').returns sample_swap_line
+        Facter::Core::Execution.stubs(:exec).with('/usr/sbin/swap -l 2>/dev/null').returns sample_swap_line
 
         Facter.collection.internal_loader.load(:memory)
       end
@@ -316,7 +316,7 @@ swapfile             dev  swaplo blocks   free
 /dev/swap           4294967295,4294967295     16 2097136 2097136
 /dev/swap2          4294967295,4294967295     16 2097136 2097136
 SWAP
-        Facter::Util::Resolution.stubs(:exec).with('/usr/sbin/swap -l 2>/dev/null').returns sample_swap_line
+        Facter::Core::Execution.stubs(:exec).with('/usr/sbin/swap -l 2>/dev/null').returns sample_swap_line
         Facter.collection.internal_loader.load(:memory)
       end
 
@@ -339,7 +339,7 @@ SWAP
 
     describe "when no swap exists" do
       before(:each) do
-        Facter::Util::Resolution.stubs(:exec).with('/usr/sbin/swap -l 2>/dev/null').returns ""
+        Facter::Core::Execution.stubs(:exec).with('/usr/sbin/swap -l 2>/dev/null').returns ""
 
         Facter.collection.internal_loader.load(:memory)
       end
@@ -368,19 +368,19 @@ SWAP
         Facter.fact(:kernel).stubs(:value).returns("dragonfly")
 
         swapusage = "total: 148342k bytes allocated = 0k used, 148342k available"
-        Facter::Util::Resolution.stubs(:exec).with('/sbin/sysctl -n hw.pagesize').returns("4096")
-        Facter::Util::Resolution.stubs(:exec).with('/sbin/sysctl -n vm.swap_size').returns("128461")
-        Facter::Util::Resolution.stubs(:exec).with('/sbin/sysctl -n vm.swap_anon_use').returns("2635")
-        Facter::Util::Resolution.stubs(:exec).with('/sbin/sysctl -n vm.swap_cache_use').returns("0")
+        Facter::Core::Execution.stubs(:exec).with('/sbin/sysctl -n hw.pagesize').returns("4096")
+        Facter::Core::Execution.stubs(:exec).with('/sbin/sysctl -n vm.swap_size').returns("128461")
+        Facter::Core::Execution.stubs(:exec).with('/sbin/sysctl -n vm.swap_anon_use').returns("2635")
+        Facter::Core::Execution.stubs(:exec).with('/sbin/sysctl -n vm.swap_cache_use').returns("0")
 
         vmstat = <<EOS
  procs    memory    page          disks   faults    cpu
  r b w   avm  fre  flt  re  pi  po  fr  sr da0 sg1   in   sy  cs us sy id
  0 0 0   33152  13940 1902120 2198 53119 11642 6544597 5460994   0   0 6148243 7087927 3484264  0  1 9
 EOS
-        Facter::Util::Resolution.stubs(:exec).with('vmstat').returns(vmstat)
+        Facter::Core::Execution.stubs(:exec).with('vmstat').returns(vmstat)
 
-        Facter::Util::Resolution.stubs(:exec).with("sysctl -n hw.physmem").returns('248512512')
+        Facter::Core::Execution.stubs(:exec).with("sysctl -n hw.physmem").returns('248512512')
 
         Facter.collection.internal_loader.load(:memory)
       end
@@ -416,11 +416,11 @@ EOS
  r b w     avm    fre   flt  re  pi  po    fr  sr da0 cd0   in   sy   cs us sy id
  1 0 0  207600  656640    10   0   0   0    13   0   0   0   51  164  257  0  1 99
 VM_STAT
-        Facter::Util::Resolution.stubs(:exec).with('vmstat -H').returns sample_vmstat
+        Facter::Core::Execution.stubs(:exec).with('vmstat -H').returns sample_vmstat
         sample_physmem = <<PHYSMEM
 1056276480
 PHYSMEM
-        Facter::Util::Resolution.stubs(:exec).with('sysctl -n hw.physmem').returns sample_physmem
+        Facter::Core::Execution.stubs(:exec).with('sysctl -n hw.physmem').returns sample_physmem
       end
 
       after(:each) do
@@ -432,7 +432,7 @@ PHYSMEM
           sample_swapinfo = <<SWAP
 Device          1K-blocks     Used    Avail Capacity
 SWAP
-          Facter::Util::Resolution.stubs(:exec).with('swapinfo -k').returns sample_swapinfo
+          Facter::Core::Execution.stubs(:exec).with('swapinfo -k').returns sample_swapinfo
 
           Facter.collection.internal_loader.load(:memory)
         end
@@ -460,7 +460,7 @@ SWAP
 Device          1K-blocks     Used    Avail Capacity
 /dev/da0p3        2048540        0  1048540     0%
 SWAP
-          Facter::Util::Resolution.stubs(:exec).with('swapinfo -k').returns sample_swapinfo
+          Facter::Core::Execution.stubs(:exec).with('swapinfo -k').returns sample_swapinfo
 
           Facter.collection.internal_loader.load(:memory)
         end
@@ -489,7 +489,7 @@ Device          1K-blocks     Used    Avail Capacity
 /dev/da0p3        2048540        0  1048540     0%
 /dev/da0p4        3048540        0  1048540     0%
 SWAP
-          Facter::Util::Resolution.stubs(:exec).with('swapinfo -k').returns sample_swapinfo
+          Facter::Core::Execution.stubs(:exec).with('swapinfo -k').returns sample_swapinfo
 
           Facter.collection.internal_loader.load(:memory)
         end
@@ -534,13 +534,6 @@ SWAP
         Facter::Util::WMI.stubs(:execquery).returns([computer])
 
         Facter.fact(:memorysize_mb).value.should == '3999.55'
-        Facter.fact(:MemoryTotal).value.should == '3.91 GB'
     end
   end
-
-  it "should use the memorysize fact for the memorytotal fact" do
-    Facter.fact("memorysize").expects(:value).once.returns "16.00 GB"
-    Facter::Util::Resolution.expects(:exec).never
-    Facter.fact(:memorytotal).value.should == "16.00 GB"
-  end
 end