facter 1.6.1 → 1.6.2

data/spec/fixtures/processorcount/solaris-x86_64-kstat-cpu-info

@@ -0,0 +1,225 @@
+module: cpu_info                        instance: 0     
+name:   cpu_info0                       class:    misc
+	brand                           Quad-Core AMD Opteron(tm) Processor 2356
+	cache_id                        0
+	chip_id                         0
+	clock_MHz                       2300
+	clog_id                         0
+	core_id                         0
+	cpu_type                        i386
+	crtime                          150.118972763
+	current_clock_Hz                2300000000
+	current_cstate                  0
+	family                          16
+	fpu_type                        i387 compatible
+	implementation                  x86 (chipid 0x0 AuthenticAMD family 16 model 2 step 3 clock 2300 MHz)
+	model                           2
+	ncore_per_chip                  4
+	ncpu_per_chip                   4
+	pg_id                           2
+	pkg_core_id                     0
+	snaptime                        1964970.24919915
+	state                           on-line
+	state_begin                     1315115687
+	stepping                        3
+	supported_frequencies_Hz        1200000000:1400000000:1700000000:2000000000:2300000000
+	supported_max_cstates           0
+	vendor_id                       AuthenticAMD
+
+module: cpu_info                        instance: 1     
+name:   cpu_info1                       class:    misc
+	brand                           Quad-Core AMD Opteron(tm) Processor 2356
+	cache_id                        1
+	chip_id                         0
+	clock_MHz                       2300
+	clog_id                         1
+	core_id                         1
+	cpu_type                        i386
+	crtime                          153.090853556
+	current_clock_Hz                1200000000
+	current_cstate                  1
+	family                          16
+	fpu_type                        i387 compatible
+	implementation                  x86 (chipid 0x0 AuthenticAMD family 16 model 2 step 3 clock 2300 MHz)
+	model                           2
+	ncore_per_chip                  4
+	ncpu_per_chip                   4
+	pg_id                           3
+	pkg_core_id                     1
+	snaptime                        1964970.24965225
+	state                           on-line
+	state_begin                     1315115690
+	stepping                        3
+	supported_frequencies_Hz        1200000000:1400000000:1700000000:2000000000:2300000000
+	supported_max_cstates           0
+	vendor_id                       AuthenticAMD
+
+module: cpu_info                        instance: 2     
+name:   cpu_info2                       class:    misc
+	brand                           Quad-Core AMD Opteron(tm) Processor 2356
+	cache_id                        2
+	chip_id                         0
+	clock_MHz                       2300
+	clog_id                         2
+	core_id                         2
+	cpu_type                        i386
+	crtime                          153.160162766
+	current_clock_Hz                1200000000
+	current_cstate                  1
+	family                          16
+	fpu_type                        i387 compatible
+	implementation                  x86 (chipid 0x0 AuthenticAMD family 16 model 2 step 3 clock 2300 MHz)
+	model                           2
+	ncore_per_chip                  4
+	ncpu_per_chip                   4
+	pg_id                           4
+	pkg_core_id                     2
+	snaptime                        1964970.24997443
+	state                           on-line
+	state_begin                     1315115690
+	stepping                        3
+	supported_frequencies_Hz        1200000000:1400000000:1700000000:2000000000:2300000000
+	supported_max_cstates           0
+	vendor_id                       AuthenticAMD
+
+module: cpu_info                        instance: 3     
+name:   cpu_info3                       class:    misc
+	brand                           Quad-Core AMD Opteron(tm) Processor 2356
+	cache_id                        3
+	chip_id                         0
+	clock_MHz                       2300
+	clog_id                         3
+	core_id                         3
+	cpu_type                        i386
+	crtime                          153.190177596
+	current_clock_Hz                1200000000
+	current_cstate                  1
+	family                          16
+	fpu_type                        i387 compatible
+	implementation                  x86 (chipid 0x0 AuthenticAMD family 16 model 2 step 3 clock 2300 MHz)
+	model                           2
+	ncore_per_chip                  4
+	ncpu_per_chip                   4
+	pg_id                           5
+	pkg_core_id                     3
+	snaptime                        1964970.2502919
+	state                           on-line
+	state_begin                     1315115690
+	stepping                        3
+	supported_frequencies_Hz        1200000000:1400000000:1700000000:2000000000:2300000000
+	supported_max_cstates           0
+	vendor_id                       AuthenticAMD
+
+module: cpu_info                        instance: 4     
+name:   cpu_info4                       class:    misc
+	brand                           Quad-Core AMD Opteron(tm) Processor 2356
+	cache_id                        4
+	chip_id                         1
+	clock_MHz                       2300
+	clog_id                         0
+	core_id                         4
+	cpu_type                        i386
+	crtime                          153.2201642
+	current_clock_Hz                1200000000
+	current_cstate                  1
+	family                          16
+	fpu_type                        i387 compatible
+	implementation                  x86 (chipid 0x1 AuthenticAMD family 16 model 2 step 3 clock 2300 MHz)
+	model                           2
+	ncore_per_chip                  4
+	ncpu_per_chip                   4
+	pg_id                           7
+	pkg_core_id                     0
+	snaptime                        1964970.2505907
+	state                           on-line
+	state_begin                     1315115690
+	stepping                        3
+	supported_frequencies_Hz        1200000000:1400000000:1700000000:2000000000:2300000000
+	supported_max_cstates           0
+	vendor_id                       AuthenticAMD
+
+module: cpu_info                        instance: 5     
+name:   cpu_info5                       class:    misc
+	brand                           Quad-Core AMD Opteron(tm) Processor 2356
+	cache_id                        5
+	chip_id                         1
+	clock_MHz                       2300
+	clog_id                         1
+	core_id                         5
+	cpu_type                        i386
+	crtime                          153.250190916
+	current_clock_Hz                1200000000
+	current_cstate                  1
+	family                          16
+	fpu_type                        i387 compatible
+	implementation                  x86 (chipid 0x1 AuthenticAMD family 16 model 2 step 3 clock 2300 MHz)
+	model                           2
+	ncore_per_chip                  4
+	ncpu_per_chip                   4
+	pg_id                           8
+	pkg_core_id                     1
+	snaptime                        1964970.25087316
+	state                           on-line
+	state_begin                     1315115690
+	stepping                        3
+	supported_frequencies_Hz        1200000000:1400000000:1700000000:2000000000:2300000000
+	supported_max_cstates           0
+	vendor_id                       AuthenticAMD
+
+module: cpu_info                        instance: 6     
+name:   cpu_info6                       class:    misc
+	brand                           Quad-Core AMD Opteron(tm) Processor 2356
+	cache_id                        6
+	chip_id                         1
+	clock_MHz                       2300
+	clog_id                         2
+	core_id                         6
+	cpu_type                        i386
+	crtime                          153.280185962
+	current_clock_Hz                1200000000
+	current_cstate                  1
+	family                          16
+	fpu_type                        i387 compatible
+	implementation                  x86 (chipid 0x1 AuthenticAMD family 16 model 2 step 3 clock 2300 MHz)
+	model                           2
+	ncore_per_chip                  4
+	ncpu_per_chip                   4
+	pg_id                           9
+	pkg_core_id                     2
+	snaptime                        1964970.25117252
+	state                           on-line
+	state_begin                     1315115690
+	stepping                        3
+	supported_frequencies_Hz        1200000000:1400000000:1700000000:2000000000:2300000000
+	supported_max_cstates           0
+	vendor_id                       AuthenticAMD
+
+module: cpu_info                        instance: 7     
+name:   cpu_info7                       class:    misc
+	brand                           Quad-Core AMD Opteron(tm) Processor 2356
+	cache_id                        7
+	chip_id                         1
+	clock_MHz                       2300
+	clog_id                         3
+	core_id                         7
+	cpu_type                        i386
+	crtime                          153.310206904
+	current_clock_Hz                2300000000
+	current_cstate                  1
+	family                          16
+	fpu_type                        i387 compatible
+	implementation                  x86 (chipid 0x1 AuthenticAMD family 16 model 2 step 3 clock 2300 MHz)
+	model                           2
+	ncore_per_chip                  4
+	ncpu_per_chip                   4
+	pg_id                           10
+	pkg_core_id                     3
+	snaptime                        1964970.25143389
+	state                           on-line
+	state_begin                     1315115690
+	stepping                        3
+	supported_frequencies_Hz        1200000000:1400000000:1700000000:2000000000:2300000000
+	supported_max_cstates           0
+	vendor_id                       AuthenticAMD
+
+

data/spec/integration/facter_spec.rb

@@ -3,25 +3,25 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Facter do
-    before do
-        Facter.reset
-    end
+  before do
+    Facter.reset
+  end
 
-    after do
-        Facter.reset
-    end
+  after do
+    Facter.reset
+  end
 
-    it "should create a new collection if one does not exist" do
-        Facter.reset
-        coll = mock('coll')
-        Facter::Util::Collection.stubs(:new).returns coll
-        Facter.collection.should equal(coll)
-        Facter.reset
-    end
+  it "should create a new collection if one does not exist" do
+    Facter.reset
+    coll = mock('coll')
+    Facter::Util::Collection.stubs(:new).returns coll
+    Facter.collection.should equal(coll)
+    Facter.reset
+  end
 
-    it "should remove the collection when reset" do
-        old = Facter.collection
-        Facter.reset
-        Facter.collection.should_not equal(old)
-    end
+  it "should remove the collection when reset" do
+    old = Facter.collection
+    Facter.reset
+    Facter.collection.should_not equal(old)
+  end
 end

data/spec/spec_helper.rb

@@ -16,10 +16,19 @@ Dir["#{dir}/monkey_patches/*.rb"].map { |file| require file }
 RSpec.configure do |config|
   config.mock_with :mocha
 
-  # Ensure that we don't accidentally cache between test cases.
+  # Ensure that we don't accidentally cache facts and environment
+  # between test cases.
   config.before :each do
     Facter::Util::Loader.any_instance.stubs(:load_all)
     Facter.clear
     Facter.clear_messages
+    @old_env = {}
+    ENV.each_key {|k| @old_env[k] = ENV[k]}
+  end
+
+  config.after :each do
+    @old_env.each_pair {|k, v| ENV[k] = v}
+    to_remove = ENV.keys.reject {|key| @old_env.include? key }
+    to_remove.each {|key| ENV.delete key }
   end
 end

data/spec/unit/architecture_spec.rb

@@ -0,0 +1,54 @@
+#!/usr/bin/env ruby
+
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+require 'facter'
+
+describe "Architecture fact" do
+
+    it "should default to the hardware model" do
+        Facter.fact(:hardwaremodel).stubs(:value).returns("NonSpecialCasedHW")
+
+        Facter.fact(:architecture).value.should == "NonSpecialCasedHW"
+    end
+
+    os_archs = Hash.new
+    os_archs = {
+	["Debian","x86_64"] => "amd64",
+	["Gentoo","x86_64"] => "amd64",
+	["GNU/kFreeBSD","x86_64"] => "amd64",
+	["Ubuntu","x86_64"] => "amd64",
+	["Gentoo","i386"] => "x86",
+	["Gentoo","i486"] => "x86",
+	["Gentoo","i586"] => "x86",
+	["Gentoo","i686"] => "x86",
+	["Gentoo","pentium"] => "x86",
+    }
+    generic_archs = Hash.new
+    generic_archs = {
+	"i386" => "i386",
+	"i486" => "i386",
+	"i586" => "i386",
+	"i686" => "i386",
+	"pentium" => "i386",
+    }
+    
+    os_archs.each do |pair, result|
+	it "should be #{result} if os is #{pair[0]} and hardwaremodel is #{pair[1]}" do
+	 Facter.fact(:operatingsystem).stubs(:value).returns(pair[0])
+	 Facter.fact(:hardwaremodel).stubs(:value).returns(pair[1])
+
+	 Facter.fact(:architecture).value.should == result
+	end
+    end
+
+    generic_archs.each do |hw, result|
+	it "should be #{result} if hardwaremodel is #{hw}" do
+	 Facter.fact(:hardwaremodel).stubs(:value).returns(hw)
+	 Facter.fact(:operatingsystem).stubs(:value).returns("NonSpecialCasedOS")
+
+	 Facter.fact(:architecture).value.should == result
+	end
+    end
+
+end

data/spec/unit/domain_spec.rb

@@ -69,6 +69,29 @@ describe "Domain name facts" do
         @mock_file.expects(:each).multiple_yields(*lines)
         Facter.fact(:domain).value.should == 'example.org'
       end
+
+      # Test permutations of domain and search
+      [
+        ["domain domain", "domain"],
+        ["domain search", "search"],
+        ["search domain", "domain"],
+        ["search search", "search"],
+        ["search domain notdomain", "domain"],
+        [["#search notdomain","search search"], "search"],
+        [["# search notdomain","search search"], "search"],
+        [["#domain notdomain","domain domain"], "domain"],
+        [["# domain notdomain","domain domain"], "domain"],
+      ].each do |tuple|
+        field  = tuple[0]
+        expect = tuple[1]
+        it "should return #{expect} from \"#{field}\"" do
+          lines = [
+            field
+          ].flatten
+          @mock_file.expects(:each).multiple_yields(*lines)
+          Facter.fact(:domain).value.should == expect
+        end
+      end
     end
   end
 

data/spec/unit/memory_spec.rb

@@ -42,7 +42,84 @@ describe "Memory facts" do
         swapusage = "vm.swapusage: total = 64.00M  used = 0.00M  free = 64.00M  (encrypted)"
 
         swapusage =~ /\(encrypted\)/
-	Facter.fact(:swapencrypted).value.should == true
+        Facter.fact(:swapencrypted).value.should == true
+    end
+
+    describe "on OpenBSD" do
+        before :each do
+            Facter.clear
+            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)
+
+            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::Util::Resolution.stubs(:exec).with("sysctl hw.physmem | cut -d'=' -f2").returns('267321344')
+
+            Facter.collection.loader.load(:memory)
+        end
+
+        after :each do
+            Facter.clear
+        end
+
+        it "should return the current swap free" do
+            Facter.fact(:swapfree).value.should == "144.87 MB"
+        end
+
+        it "should return the current swap size" do
+            Facter.fact(:swapsize).value.should == "144.87 MB"
+        end
+
+        it "should return the current memorysize" do
+            Facter.fact(:memorytotal).value.should == "254.94 MB"
+        end
+    end
+
+    describe "on DragonFly BSD" do
+        before :each do
+            Facter.clear
+            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")
+
+            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::Util::Resolution.stubs(:exec).with("sysctl -n hw.physmem").returns('248512512')
+
+            Facter.collection.loader.load(:memory)
+        end
+
+        after :each do
+            Facter.clear
+        end
+
+        it "should return the current swap free" do
+            Facter.fact(:swapfree).value.should == "491.51 MB"
+        end
+
+        it "should return the current swap size" do
+            Facter.fact(:swapsize).value.should == "501.80 MB"
+        end
+
+        it "should return the current memorysize" do
+            Facter.fact(:memorytotal).value.should == "237.00 MB"
+        end
     end
 
     describe "on Windows" do