facter 1.6.4 → 1.6.5

data/spec/unit/util/fact_spec.rb

@@ -1,7 +1,6 @@
-#!/usr/bin/env ruby
-
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+#!/usr/bin/env rspec
 
+require 'spec_helper'
 require 'facter/util/fact'
 
 describe Facter::Util::Fact do

data/spec/unit/util/ip_spec.rb

@@ -1,7 +1,6 @@
-#!/usr/bin/env ruby
-
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+#!/usr/bin/env rspec
 
+require 'spec_helper'
 require 'facter/util/ip'
 
 describe Facter::Util::IP do
@@ -26,44 +25,38 @@ describe Facter::Util::IP do
   end
 
   it "should return a list with a single interface and the loopback interface on Linux with a single interface" do
-    sample_output_file = File.dirname(__FILE__) + '/../data/linux_ifconfig_all_with_single_interface'
-    linux_ifconfig = File.read(sample_output_file)
+    linux_ifconfig = my_fixture_read("linux_ifconfig_all_with_single_interface")
     Facter::Util::IP.stubs(:get_all_interface_output).returns(linux_ifconfig)
     Facter::Util::IP.get_interfaces().should == ["eth0", "lo"]
   end
 
   it "should return a list two interfaces on Darwin with two interfaces" do
-    sample_output_file = File.dirname(__FILE__) + '/../data/darwin_ifconfig_all_with_multiple_interfaces'
-    darwin_ifconfig = File.read(sample_output_file)
+    darwin_ifconfig = my_fixture_read("darwin_ifconfig_all_with_multiple_interfaces")
     Facter::Util::IP.stubs(:get_all_interface_output).returns(darwin_ifconfig)
     Facter::Util::IP.get_interfaces().should == ["lo0", "en0"]
   end
 
   it "should return a list two interfaces on Solaris with two interfaces multiply reporting" do
-    sample_output_file = File.dirname(__FILE__) + '/../data/solaris_ifconfig_all_with_multiple_interfaces'
-    solaris_ifconfig = File.read(sample_output_file)
+    solaris_ifconfig = my_fixture_read("solaris_ifconfig_all_with_multiple_interfaces")
     Facter::Util::IP.stubs(:get_all_interface_output).returns(solaris_ifconfig)
     Facter::Util::IP.get_interfaces().should == ["lo0", "e1000g0"]
   end
 
   it "should return a list three interfaces on HP-UX with three interfaces multiply reporting" do
-    sample_output_file = File.dirname(__FILE__) + '/../data/hpux_netstat_all_interfaces'
-    hpux_netstat = File.read(sample_output_file)
+    hpux_netstat = my_fixture_read("hpux_netstat_all_interfaces")
     Facter::Util::IP.stubs(:get_all_interface_output).returns(hpux_netstat)
     Facter::Util::IP.get_interfaces().should == ["lan1", "lan0", "lo0"]
   end
 
   it "should return a list of six interfaces on a GNU/kFreeBSD with six interfaces" do
-    sample_output_file = File.dirname(__FILE__) + '/../data/debian_kfreebsd_ifconfig'
-    kfreebsd_ifconfig = File.read(sample_output_file)
+    kfreebsd_ifconfig = my_fixture_read("debian_kfreebsd_ifconfig")
     Facter::Util::IP.stubs(:get_all_interface_output).returns(kfreebsd_ifconfig)
     Facter::Util::IP.get_interfaces().should == ["em0", "em1", "bge0", "bge1", "lo0", "vlan0"]
   end
 
   it "should return a list of only connected interfaces on Windows" do
     Facter.fact(:kernel).stubs(:value).returns("windows")
-    sample_output_file = File.dirname(__FILE__) + '/../data/windows_netsh_all_interfaces'
-    windows_netsh = File.read(sample_output_file)
+    windows_netsh = my_fixture_read("windows_netsh_all_interfaces")
     Facter::Util::IP.stubs(:get_all_interface_output).returns(windows_netsh)
     Facter::Util::IP.get_interfaces().should == ["Loopback Pseudo-Interface 1", "Local Area Connection", "Teredo Tunneling Pseudo-Interface"]
   end
@@ -78,8 +71,7 @@ describe Facter::Util::IP do
   end
 
   it "should return ipaddress information for Solaris" do
-    sample_output_file = File.dirname(__FILE__) + "/../data/solaris_ifconfig_single_interface"
-    solaris_ifconfig_interface = File.read(sample_output_file)
+    solaris_ifconfig_interface = my_fixture_read("solaris_ifconfig_single_interface")
 
     Facter::Util::IP.expects(:get_single_interface_output).with("e1000g0").returns(solaris_ifconfig_interface)
     Facter.stubs(:value).with(:kernel).returns("SunOS")
@@ -88,8 +80,7 @@ describe Facter::Util::IP do
   end
 
   it "should return netmask information for Solaris" do
-    sample_output_file = File.dirname(__FILE__) + "/../data/solaris_ifconfig_single_interface"
-    solaris_ifconfig_interface = File.read(sample_output_file)
+    solaris_ifconfig_interface = my_fixture_read("solaris_ifconfig_single_interface")
 
     Facter::Util::IP.expects(:get_single_interface_output).with("e1000g0").returns(solaris_ifconfig_interface)
     Facter.stubs(:value).with(:kernel).returns("SunOS")
@@ -98,8 +89,7 @@ describe Facter::Util::IP do
   end
 
   it "should return calculated network information for Solaris" do
-    sample_output_file = File.dirname(__FILE__) + "/../data/solaris_ifconfig_single_interface"
-    solaris_ifconfig_interface = File.read(sample_output_file)
+    solaris_ifconfig_interface = my_fixture_read("solaris_ifconfig_single_interface")
 
     Facter::Util::IP.stubs(:get_single_interface_output).with("e1000g0").returns(solaris_ifconfig_interface)
     Facter.stubs(:value).with(:kernel).returns("SunOS")
@@ -108,8 +98,7 @@ describe Facter::Util::IP do
   end
 
   it "should return ipaddress information for HP-UX" do
-    sample_output_file = File.dirname(__FILE__) + "/../data/hpux_ifconfig_single_interface"
-    hpux_ifconfig_interface = File.read(sample_output_file)
+    hpux_ifconfig_interface = my_fixture_read("hpux_ifconfig_single_interface")
 
     Facter::Util::IP.expects(:get_single_interface_output).with("lan0").returns(hpux_ifconfig_interface)
     Facter.stubs(:value).with(:kernel).returns("HP-UX")
@@ -118,8 +107,7 @@ describe Facter::Util::IP do
   end
 
   it "should return macaddress information for HP-UX" do
-    sample_output_file = File.dirname(__FILE__) + "/../data/hpux_ifconfig_single_interface"
-    hpux_ifconfig_interface = File.read(sample_output_file)
+    hpux_ifconfig_interface = my_fixture_read("hpux_ifconfig_single_interface")
 
     Facter::Util::IP.expects(:get_single_interface_output).with("lan0").returns(hpux_ifconfig_interface)
     Facter.stubs(:value).with(:kernel).returns("HP-UX")
@@ -128,8 +116,7 @@ describe Facter::Util::IP do
   end
 
   it "should return macaddress with leading zeros stripped off for GNU/kFreeBSD" do
-    sample_output_file = File.dirname(__FILE__) + "/../data/debian_kfreebsd_ifconfig"
-    kfreebsd_ifconfig = File.read(sample_output_file)
+    kfreebsd_ifconfig = my_fixture_read("debian_kfreebsd_ifconfig")
 
     Facter::Util::IP.expects(:get_single_interface_output).with("em0").returns(kfreebsd_ifconfig)
     Facter.stubs(:value).with(:kernel).returns("GNU/kFreeBSD")
@@ -138,8 +125,7 @@ describe Facter::Util::IP do
   end
 
   it "should return netmask information for HP-UX" do
-    sample_output_file = File.dirname(__FILE__) + "/../data/hpux_ifconfig_single_interface"
-    hpux_ifconfig_interface = File.read(sample_output_file)
+    hpux_ifconfig_interface = my_fixture_read("hpux_ifconfig_single_interface")
 
     Facter::Util::IP.expects(:get_single_interface_output).with("lan0").returns(hpux_ifconfig_interface)
     Facter.stubs(:value).with(:kernel).returns("HP-UX")
@@ -148,8 +134,7 @@ describe Facter::Util::IP do
   end
 
   it "should return calculated network information for HP-UX" do
-    sample_output_file = File.dirname(__FILE__) + "/../data/hpux_ifconfig_single_interface"
-    hpux_ifconfig_interface = File.read(sample_output_file)
+    hpux_ifconfig_interface = my_fixture_read("hpux_ifconfig_single_interface")
 
     Facter::Util::IP.stubs(:get_single_interface_output).with("lan0").returns(hpux_ifconfig_interface)
     Facter.stubs(:value).with(:kernel).returns("HP-UX")
@@ -158,8 +143,7 @@ describe Facter::Util::IP do
   end
 
   it "should return interface information for FreeBSD supported via an alias" do
-    sample_output_file = File.dirname(__FILE__) + "/../data/6.0-STABLE_FreeBSD_ifconfig"
-    ifconfig_interface = File.read(sample_output_file)
+    ifconfig_interface = my_fixture_read("6.0-STABLE_FreeBSD_ifconfig")
 
     Facter::Util::IP.expects(:get_single_interface_output).with("fxp0").returns(ifconfig_interface)
     Facter.stubs(:value).with(:kernel).returns("FreeBSD")
@@ -168,8 +152,7 @@ describe Facter::Util::IP do
   end
 
   it "should return macaddress information for OS X" do
-    sample_output_file = File.dirname(__FILE__) + "/../data/Mac_OS_X_10.5.5_ifconfig"
-    ifconfig_interface = File.read(sample_output_file)
+    ifconfig_interface = my_fixture_read("Mac_OS_X_10.5.5_ifconfig")
 
     Facter::Util::IP.expects(:get_single_interface_output).with("en1").returns(ifconfig_interface)
     Facter.stubs(:value).with(:kernel).returns("Darwin")
@@ -178,8 +161,7 @@ describe Facter::Util::IP do
   end
 
   it "should return all interfaces correctly on OS X" do
-    sample_output_file = File.dirname(__FILE__) + "/../data/Mac_OS_X_10.5.5_ifconfig"
-    ifconfig_interface = File.read(sample_output_file)
+    ifconfig_interface = my_fixture_read("Mac_OS_X_10.5.5_ifconfig")
 
     Facter::Util::IP.expects(:get_all_interface_output).returns(ifconfig_interface)
     Facter.stubs(:value).with(:kernel).returns("Darwin")
@@ -188,8 +170,7 @@ describe Facter::Util::IP do
   end
 
   it "should return a human readable netmask on Solaris" do
-    sample_output_file = File.dirname(__FILE__) + "/../data/solaris_ifconfig_single_interface"
-    solaris_ifconfig_interface = File.read(sample_output_file)
+    solaris_ifconfig_interface = my_fixture_read("solaris_ifconfig_single_interface")
 
     Facter::Util::IP.expects(:get_single_interface_output).with("e1000g0").returns(solaris_ifconfig_interface)
     Facter.stubs(:value).with(:kernel).returns("SunOS")
@@ -198,8 +179,7 @@ describe Facter::Util::IP do
   end
 
   it "should return a human readable netmask on HP-UX" do
-    sample_output_file = File.dirname(__FILE__) + "/../data/hpux_ifconfig_single_interface"
-    hpux_ifconfig_interface = File.read(sample_output_file)
+    hpux_ifconfig_interface = my_fixture_read("hpux_ifconfig_single_interface")
 
     Facter::Util::IP.expects(:get_single_interface_output).with("lan0").returns(hpux_ifconfig_interface)
     Facter.stubs(:value).with(:kernel).returns("HP-UX")
@@ -208,9 +188,7 @@ describe Facter::Util::IP do
   end
 
   it "should return a human readable netmask on Darwin" do
-    sample_output_file = File.dirname(__FILE__) + "/../data/darwin_ifconfig_single_interface"
-
-    darwin_ifconfig_interface = File.read(sample_output_file)
+    darwin_ifconfig_interface = my_fixture_read("darwin_ifconfig_single_interface")
 
     Facter::Util::IP.expects(:get_single_interface_output).with("en1").returns(darwin_ifconfig_interface)
     Facter.stubs(:value).with(:kernel).returns("Darwin")
@@ -219,9 +197,7 @@ describe Facter::Util::IP do
   end
 
   it "should return a human readable netmask on GNU/kFreeBSD" do
-    sample_output_file = File.dirname(__FILE__) + "/../data/debian_kfreebsd_ifconfig"
-
-    kfreebsd_ifconfig = File.read(sample_output_file)
+    kfreebsd_ifconfig = my_fixture_read("debian_kfreebsd_ifconfig")
 
     Facter::Util::IP.expects(:get_single_interface_output).with("em1").returns(kfreebsd_ifconfig)
     Facter.stubs(:value).with(:kernel).returns("GNU/kFreeBSD")
@@ -260,8 +236,7 @@ describe Facter::Util::IP do
     end
 
     it "should return ipaddress information" do
-      sample_output_file = File.dirname(__FILE__) + "/../data/windows_netsh_single_interface"
-      windows_netsh = File.read(sample_output_file)
+      windows_netsh = my_fixture_read("windows_netsh_single_interface")
 
       Facter::Util::IP.expects(:get_output_for_interface_and_label).with("Local Area Connection", "ipaddress").returns(windows_netsh)
 
@@ -269,8 +244,7 @@ describe Facter::Util::IP do
     end
 
     it "should return a human readable netmask" do
-      sample_output_file = File.dirname(__FILE__) + "/../data/windows_netsh_single_interface"
-      windows_netsh = File.read(sample_output_file)
+      windows_netsh = my_fixture_read("windows_netsh_single_interface")
 
       Facter::Util::IP.expects(:get_output_for_interface_and_label).with("Local Area Connection", "netmask").returns(windows_netsh)
 
@@ -278,8 +252,7 @@ describe Facter::Util::IP do
     end
 
     it "should return network information" do
-      sample_output_file = File.dirname(__FILE__) + "/../data/windows_netsh_single_interface"
-      windows_netsh = File.read(sample_output_file)
+      windows_netsh = my_fixture_read("windows_netsh_single_interface")
 
       Facter::Util::IP.stubs(:get_output_for_interface_and_label).with("Local Area Connection", "ipaddress").returns(windows_netsh)
       Facter::Util::IP.stubs(:get_output_for_interface_and_label).with("Local Area Connection", "netmask").returns(windows_netsh)
@@ -288,8 +261,7 @@ describe Facter::Util::IP do
     end
 
     it "should return ipaddress6 information" do
-      sample_output_file = File.dirname(__FILE__) + "/../data/windows_netsh_single_interface6"
-      windows_netsh = File.read(sample_output_file)
+      windows_netsh = my_fixture_read("windows_netsh_single_interface6")
 
       Facter::Util::IP.expects(:get_output_for_interface_and_label).with("Teredo Tunneling Pseudo-Interface", "ipaddress6").returns(windows_netsh)
 

data/spec/unit/util/loader_spec.rb

@@ -1,10 +1,8 @@
-#!/usr/bin/env ruby
-
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+#!/usr/bin/env rspec
 
+require 'spec_helper'
 require 'facter/util/loader'
 
-
 # loader subclass for making assertions about file/directory ordering
 class TestLoader < Facter::Util::Loader
   def loaded_files

data/spec/unit/util/macaddress_spec.rb

@@ -1,7 +1,6 @@
-#!/usr/bin/env ruby
-
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+#!/usr/bin/env rspec
 
+require 'spec_helper'
 require 'facter/util/macaddress'
 
 describe "standardized MAC address" do
@@ -29,8 +28,8 @@ describe "Darwin", :unless => Facter.value(:operatingsystem) == 'windows' do
   ]
 
   test_cases.each do |version, default_iface, macaddress, fallback_macaddress|
-    netstat_file = File.join(SPECDIR, "fixtures", "netstat", "darwin_#{version.tr('.', '_')}")
-    ifconfig_file_no_iface = File.join(SPECDIR, "fixtures", "ifconfig", "darwin_#{version.tr('.', '_')}")
+    netstat_file = fixtures("netstat", "darwin_#{version.tr('.', '_')}")
+    ifconfig_file_no_iface = fixtures("ifconfig", "darwin_#{version.tr('.', '_')}")
     ifconfig_file = "#{ifconfig_file_no_iface}_#{default_iface}"
 
     describe "version #{version}" do

data/spec/unit/util/macosx_spec.rb

@@ -1,7 +1,6 @@
-#!/usr/bin/env ruby
-
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+#!/usr/bin/env rspec
 
+require 'spec_helper'
 require 'facter/util/macosx'
 
 describe Facter::Util::Macosx do

data/spec/unit/util/manufacturer_spec.rb

@@ -1,5 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+#!/usr/bin/env rspec
 
+require 'spec_helper'
 require 'facter/util/manufacturer'
 
 describe Facter::Manufacturer do
@@ -17,14 +18,14 @@ describe Facter::Manufacturer do
   end
 
   it "should parse prtdiag output on a sunfire v120" do
-    Facter::Util::Resolution.stubs(:exec).returns(fixture_data(File.join("unit", "util", "manufacturer", "solaris_sunfire_v120_prtdiag")))
+    Facter::Util::Resolution.stubs(:exec).returns(my_fixture_read("solaris_sunfire_v120_prtdiag"))
     Facter::Manufacturer.prtdiag_sparc_find_system_info()
     Facter.value(:manufacturer).should == "Sun Microsystems"
     Facter.value(:productname).should == "Sun Fire V120 (UltraSPARC-IIe 648MHz)"
   end
 
   it "should parse prtdiag output on a t5220" do
-    Facter::Util::Resolution.stubs(:exec).returns(fixture_data(File.join("unit", "util", "manufacturer", "solaris_t5220_prtdiag")))
+    Facter::Util::Resolution.stubs(:exec).returns(my_fixture_read("solaris_t5220_prtdiag"))
     Facter::Manufacturer.prtdiag_sparc_find_system_info()
     Facter.value(:manufacturer).should == "Sun Microsystems"
     Facter.value(:productname).should == "SPARC Enterprise T5220"
@@ -41,8 +42,7 @@ describe Facter::Manufacturer do
   end
 
   it "should strip white space on dmi output with spaces" do
-    sample_output_file = File.dirname(__FILE__) + "/../data/linux_dmidecode_with_spaces"
-    dmidecode_output = File.new(sample_output_file).read()
+    dmidecode_output = my_fixture_read("linux_dmidecode_with_spaces")
     Facter::Manufacturer.expects(:get_dmi_table).returns(dmidecode_output)
     Facter.fact(:kernel).stubs(:value).returns("Linux")
 
@@ -53,8 +53,7 @@ describe Facter::Manufacturer do
   end
 
   it "should handle output from smbios when run under sunos" do
-    sample_output_file = File.dirname(__FILE__) + "/../data/opensolaris_smbios"
-    smbios_output = File.new(sample_output_file).read()
+    smbios_output = my_fixture_read("opensolaris_smbios")
     Facter::Manufacturer.expects(:get_dmi_table).returns(smbios_output)
     Facter.fact(:kernel).stubs(:value).returns("SunOS")
 
@@ -126,8 +125,8 @@ Handle 0x001F
 
   def find_product_name(os)
     output_file = case os
-      when "FreeBSD" then File.dirname(__FILE__) + "/../data/freebsd_dmidecode"
-      when "SunOS" then File.dirname(__FILE__) + "/../data/opensolaris_smbios"
+      when "FreeBSD" then my_fixture("freebsd_dmidecode")
+      when "SunOS" then my_fixture("opensolaris_smbios")
       end
 
     output = File.new(output_file).read()

data/spec/unit/util/processor_spec.rb

@@ -1,12 +1,10 @@
-#!/usr/bin/env ruby
-
-$basedir = File.expand_path(File.dirname(__FILE__) + '/../..')
-require File.join($basedir, 'spec_helper')
+#!/usr/bin/env rspec
 
+require 'spec_helper'
 require 'facter/util/processor'
 
 def cpuinfo_fixture(filename)
-  cpuinfo = File.open(File.join($basedir, 'fixtures', 'cpuinfo', filename)).readlines
+  File.open(fixtures('cpuinfo', filename)).readlines
 end
 
 describe Facter::Util::Processor do
@@ -15,7 +13,7 @@ describe Facter::Util::Processor do
     Facter.fact(:architecture).stubs(:value).returns("amd64")
     File.stubs(:exists?).with("/proc/cpuinfo").returns(true)
     File.stubs(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture("amd64solo"))
-    
+
     Facter::Util::Processor.enum_cpuinfo[0].should == "Intel(R) Core(TM)2 Duo CPU     P8700  @ 2.53GHz"
   end
 
@@ -24,22 +22,22 @@ describe Facter::Util::Processor do
     Facter.fact(:architecture).stubs(:value).returns("amd64")
     File.stubs(:exists?).with("/proc/cpuinfo").returns(true)
     File.stubs(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture("amd64dual"))
-    
+
     Facter::Util::Processor.enum_cpuinfo[0].should == "Intel(R) Core(TM)2 Duo CPU     P8700  @ 2.53GHz"
     Facter::Util::Processor.enum_cpuinfo[1].should == "Intel(R) Core(TM)2 Duo CPU     P8700  @ 2.53GHz"
   end
-  
+
   it "should get the processor descriptions from the amd64tri fixture" do
     Facter.fact(:kernel).stubs(:value).returns("Linux")
     Facter.fact(:architecture).stubs(:value).returns("amd64")
     File.stubs(:exists?).with("/proc/cpuinfo").returns(true)
     File.stubs(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture("amd64tri"))
-    
+
     Facter::Util::Processor.enum_cpuinfo[0].should == "Intel(R) Core(TM)2 Duo CPU     P8700  @ 2.53GHz"
     Facter::Util::Processor.enum_cpuinfo[1].should == "Intel(R) Core(TM)2 Duo CPU     P8700  @ 2.53GHz"
     Facter::Util::Processor.enum_cpuinfo[2].should == "Intel(R) Core(TM)2 Duo CPU     P8700  @ 2.53GHz"
   end
-  
+
   it "should get the processor descriptions from the amd64quad fixture" do
     Facter.fact(:kernel).stubs(:value).returns("Linux")
     Facter.fact(:architecture).stubs(:value).returns("amd64")

data/spec/unit/util/resolution_spec.rb

@@ -1,7 +1,6 @@
-#!/usr/bin/env ruby
-
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+#!/usr/bin/env rspec
 
+require 'spec_helper'
 require 'facter/util/resolution'
 
 describe Facter::Util::Resolution do

data/spec/unit/util/uptime_spec.rb

@@ -1,7 +1,6 @@
-#!/usr/bin/env ruby
-
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+#!/usr/bin/env rspec
 
+require 'spec_helper'
 require 'facter/util/uptime'
 
 describe Facter::Util::Uptime do
@@ -9,7 +8,7 @@ describe Facter::Util::Uptime do
   describe ".get_uptime_seconds_unix", :unless => Facter.value(:operatingsystem) == 'windows' do
     describe "when /proc/uptime is available" do
       before do
-        uptime_file = File.join(SPECDIR, "fixtures", "uptime", "ubuntu_proc_uptime")
+        uptime_file = my_fixture("ubuntu_proc_uptime")
         Facter::Util::Uptime.stubs(:uptime_file).returns("\"#{uptime_file}\"")
       end
 
@@ -26,15 +25,17 @@ describe Facter::Util::Uptime do
         Facter::Util::Uptime.stubs(:uptime_file).returns(@nonexistent_file)
       end
 
-      it "should use 'sysctl kern.boottime'" do
-        if [1].pack("L") == [1].pack("V") # Determine endianness
-          sysctl_output_filename = 'sysctl_kern_boottime_little_endian'
-        else
-          sysctl_output_filename = 'sysctl_kern_boottime_big_endian'
-        end
-        sysctl_output_file = File.join(SPECDIR, 'fixtures', 'uptime', sysctl_output_filename) # Aug 01 14:13:47 -0700 2010
+      it "should use 'sysctl -n kern.boottime' on OpenBSD" do
+        sysctl_output_file = my_fixture('sysctl_kern_boottime_openbsd') # Dec 09 21:11:46 +0000 2011
+        Facter::Util::Uptime.stubs(:uptime_sysctl_cmd).returns("cat \"#{sysctl_output_file}\"")
+        Time.stubs(:now).returns Time.parse("Dec 09 22:11:46 +0000 2011") # one hour later
+        Facter::Util::Uptime.get_uptime_seconds_unix.should == 60 * 60
+      end
+
+      it "should use 'sysctl -n kern.boottime' on Darwin, etc." do
+        sysctl_output_file = my_fixture('sysctl_kern_boottime_darwin') # Oct 30 21:52:27 +0000 2011
         Facter::Util::Uptime.stubs(:uptime_sysctl_cmd).returns("cat \"#{sysctl_output_file}\"")
-        Time.stubs(:now).returns Time.parse("Aug 01 15:13:47 -0700 2010") # one hour later
+        Time.stubs(:now).returns Time.parse("Oct 30 22:52:27 +0000 2011") # one hour later
         Facter::Util::Uptime.get_uptime_seconds_unix.should == 60 * 60
       end
 
@@ -44,7 +45,7 @@ describe Facter::Util::Uptime do
         end
 
         it "should use 'kstat -p unix:::boot_time'" do
-          kstat_output_file = File.join(SPECDIR, 'fixtures', 'uptime', 'kstat_boot_time') # unix:0:system_misc:boot_time    1236919980
+          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
@@ -56,7 +57,7 @@ describe Facter::Util::Uptime do
           end
 
           it "should use 'who -b'" do
-            who_b_output_file = File.join(SPECDIR, 'fixtures', 'uptime', 'who_b_boottime') # Aug 1 14:13
+            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