facter 1.5.8 → 1.5.9

data/spec/unit/{operatingsystem.rb → operatingsystem_spec.rb}

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 require 'facter'
 
@@ -9,31 +9,45 @@ describe "Operating System fact" do
     before do
         Facter.clear
     end
-    
+
     after do
         Facter.clear
     end
-    
+
     it "should default to the kernel name" do
         Facter.fact(:kernel).stubs(:value).returns("Nutmeg")
 
         Facter.fact(:operatingsystem).value.should == "Nutmeg"
     end
-    
+
     it "should be Solaris for SunOS" do
          Facter.fact(:kernel).stubs(:value).returns("SunOS")
-         
+
          Facter.fact(:operatingsystem).value.should == "Solaris"
     end
-    
-    it "should identify Oracle VM as OVS" do
 
+    it "should be ESXi for VMkernel" do
+         Facter.fact(:kernel).stubs(:value).returns("VMkernel")
+
+         Facter.fact(:operatingsystem).value.should == "ESXi"
+    end
+
+    it "should identify Oracle VM as OVS" do
         Facter.fact(:kernel).stubs(:value).returns("Linux")
         FileTest.stubs(:exists?).returns false
 
         FileTest.expects(:exists?).with("/etc/ovs-release").returns true
         FileTest.expects(:exists?).with("/etc/enterprise-release").returns true
-        
+
         Facter.fact(:operatingsystem).value.should == "OVS"
     end
+   
+    it "should identify VMWare ESX" do
+        Facter.fact(:kernel).stubs(:value).returns("Linux")
+        FileTest.stubs(:exists?).returns false
+
+        FileTest.expects(:exists?).with("/etc/vmware-release").returns true
+
+        Facter.fact(:operatingsystem).value.should == "VMWareESX"
+    end
 end

data/spec/unit/operatingsystemrelease_spec.rb

@@ -0,0 +1,49 @@
+#!/usr/bin/env ruby
+
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+require 'facter'
+
+describe "Operating System Release fact" do
+
+    before do
+        Facter.clear
+    end
+
+    after do
+        Facter.clear
+    end
+
+    test_cases = {
+        "CentOS"    => "/etc/redhat-release",
+        "RedHat"    => "/etc/redhat-release",
+        "Fedora"    => "/etc/fedora-release",
+        "MeeGo"     => "/etc/meego-release",
+        "OEL"       => "/etc/enterprise-release",
+        "oel"       => "/etc/enterprise-release",
+        "OVS"       => "/etc/ovs-release",
+        "ovs"       => "/etc/ovs-release",
+    }
+
+    test_cases.each do |system, file|
+        describe "with operatingsystem reported as #{system.inspect}" do
+            it "should read the #{file.inspect} file" do
+                Facter.fact(:operatingsystem).stubs(:value).returns(system)
+
+                File.expects(:open).with(file, "r").at_least(1)
+
+                Facter.fact(:operatingsystemrelease).value
+            end
+        end
+    end
+
+    it "for VMWareESX it should run the vmware -v command" do
+        Facter.fact(:kernel).stubs(:value).returns("VMkernel")
+        Facter.fact(:kernelrelease).stubs(:value).returns("4.1.0")
+        Facter.fact(:operatingsystem).stubs(:value).returns("VMwareESX")
+
+        Facter::Util::Resolution.stubs(:exec).with('vmware -v').returns('foo')
+
+        Facter.fact(:operatingsystemrelease).value
+    end
+end

data/spec/unit/selinux_spec.rb

@@ -0,0 +1,89 @@
+#!/usr/bin/env ruby
+
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+require 'facter'
+
+describe "SELinux facts" do
+
+
+    after do
+        Facter.clear
+    end
+
+    it "should return true if SELinux enabled" do
+        Facter.fact(:kernel).stubs(:value).returns("Linux")
+
+        FileTest.stubs(:exists?).returns false
+        File.stubs(:read).with("/proc/self/attr/current").returns("notkernel")
+
+        FileTest.expects(:exists?).with("/selinux/enforce").returns true
+        FileTest.expects(:exists?).with("/proc/self/attr/current").returns true
+        File.expects(:read).with("/proc/self/attr/current").returns("kernel")
+
+        Facter.fact(:selinux).value.should == "true"
+    end
+
+    it "should return true if SELinux policy enabled" do
+       Facter.fact(:selinux).stubs(:value).returns("true")
+
+       FileTest.stubs(:exists?).returns false
+       File.stubs(:read).with("/selinux/enforce").returns("0")
+
+       FileTest.expects(:exists?).with("/selinux/enforce").returns true
+       File.expects(:read).with("/selinux/enforce").returns("1")
+
+       Facter.fact(:selinux_enforced).value.should == "true"
+    end
+
+    it "should return an SELinux policy version" do
+       Facter.fact(:selinux).stubs(:value).returns("true")
+
+       File.stubs(:read).with("/selinux/policyvers").returns("")
+
+       File.expects(:read).with("/selinux/policyvers").returns("1")
+
+       Facter.fact(:selinux_policyversion).value.should == "1"
+    end
+
+    it "should return the SELinux current mode" do
+       Facter.fact(:selinux).stubs(:value).returns("true")
+
+       sample_output_file = File.dirname(__FILE__) + '/data/selinux_sestatus'
+       selinux_sestatus = File.read(sample_output_file)
+
+       Facter::Util::Resolution.stubs(:exec).with('/usr/sbin/sestatus').returns(selinux_sestatus)
+
+       Facter.fact(:selinux_current_mode).value.should == "permissive"
+    end
+
+    it "should return the SELinux mode from the configuration file" do
+       Facter.fact(:selinux).stubs(:value).returns("true")
+
+       sample_output_file = File.dirname(__FILE__) + '/data/selinux_sestatus'
+       selinux_sestatus = File.read(sample_output_file)
+
+       Facter::Util::Resolution.stubs(:exec).with('/usr/sbin/sestatus').returns(selinux_sestatus)
+
+       Facter.fact(:selinux_config_mode).value.should == "permissive"
+    end
+
+    it "should return the SELinux configuration file policy" do
+       Facter.fact(:selinux).stubs(:value).returns("true")
+
+       sample_output_file = File.dirname(__FILE__) + '/data/selinux_sestatus'
+       selinux_sestatus = File.read(sample_output_file)
+
+       Facter::Util::Resolution.stubs(:exec).with('/usr/sbin/sestatus').returns(selinux_sestatus)
+
+       Facter.fact(:selinux_config_policy).value.should == "targeted"
+    end
+
+    it "should ensure legacy selinux_mode facts returns same value as selinux_config_policy fact" do
+       Facter.fact(:selinux).stubs(:value).returns("true")
+
+       Facter.fact(:selinux_config_policy).stubs(:value).returns("targeted")
+
+       Facter.fact(:selinux_mode).value.should == "targeted"
+    end
+end

data/spec/unit/{uptime.rb → uptime_spec.rb}

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 require 'facter'
 require 'facter/util/uptime'
@@ -9,7 +9,7 @@ describe "uptime facts:" do
   before { Facter.clear }
   after { Facter.clear }
 
-  context "when uptime information is available" do
+  describe "when uptime information is available" do
     describe "uptime" do
       test_cases = [
         [60 * 60 * 24 * 3,      '3 days'],
@@ -34,7 +34,7 @@ describe "uptime facts:" do
 
   end
 
-  context "when uptime information is available" do
+  describe "when uptime information is available" do
     before do
       Facter::Util::Uptime.stubs(:get_uptime_seconds_unix).returns(60 * 60 * 24 + 23)
       Facter::Util::Uptime.stubs(:get_uptime_seconds_win).returns(60 * 60 * 24 + 23)
@@ -59,7 +59,7 @@ describe "uptime facts:" do
     end
   end
 
-  context "when uptime information is not available" do
+  describe "when uptime information is not available" do
     before do
       Facter::Util::Uptime.stubs(:get_uptime_seconds_unix).returns(nil)
       Facter::Util::Uptime.stubs(:get_uptime_seconds_win).returns(nil)

data/spec/unit/util/{collection.rb → collection_spec.rb}

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 require 'facter/util/collection'
 

data/spec/unit/util/{confine.rb → confine_spec.rb}

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 require 'facter/util/confine'
 require 'facter/util/values'

data/spec/unit/util/{fact.rb → fact_spec.rb}

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 require 'facter/util/fact'
 

data/spec/unit/util/{ip.rb → ip_spec.rb}

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 require 'facter/util/ip'
 
 describe Facter::Util::IP do
-    [:freebsd, :linux, :netbsd, :openbsd, :sunos, :darwin, :"hp-ux"].each do |platform|
+    [:freebsd, :linux, :netbsd, :openbsd, :sunos, :darwin, :"hp-ux", :"gnu/kfreebsd"].each do |platform|
         it "should be supported on #{platform}" do
             Facter::Util::IP.supported_platforms.should be_include(platform)
         end
@@ -20,11 +20,11 @@ describe Facter::Util::IP do
         Facter::Util::IP.get_interfaces().should == []
     end
 
-    it "should return a list with a single interface on Linux with a single interface" do
+    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.new(sample_output_file).read()
         Facter::Util::IP.stubs(:get_all_interface_output).returns(linux_ifconfig)
-        Facter::Util::IP.get_interfaces().should == ["eth0"]
+        Facter::Util::IP.get_interfaces().should == ["eth0", "lo"]
     end
 
     it "should return a list two interfaces on Darwin with two interfaces" do
@@ -46,7 +46,14 @@ describe Facter::Util::IP do
         hpux_netstat = File.new(sample_output_file).read()
         Facter::Util::IP.stubs(:get_all_interface_output).returns(hpux_netstat)
         Facter::Util::IP.get_interfaces().should == ["lan1", "lan0", "lo0"]
-    end 
+    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.new(sample_output_file).read()
+        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 value for a specific interface" do
         Facter::Util::IP.should respond_to(:get_interface_value)
@@ -95,7 +102,7 @@ describe Facter::Util::IP do
         Facter.stubs(:value).with(:kernel).returns("HP-UX")
 
         Facter::Util::IP.get_interface_value("lan0", "ipaddress").should == "168.24.80.71"
-    end 
+    end
 
     it "should return macaddress information for HP-UX" do
         sample_output_file = File.dirname(__FILE__) + "/../data/hpux_ifconfig_single_interface"
@@ -105,7 +112,17 @@ describe Facter::Util::IP do
         Facter.stubs(:value).with(:kernel).returns("HP-UX")
 
         Facter::Util::IP.get_interface_value("lan0", "macaddress").should == "00:13:21:BD:9C:B7"
-    end 
+    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.new(sample_output_file).read()
+
+        Facter::Util::IP.expects(:get_single_interface_output).with("em0").returns(kfreebsd_ifconfig)
+        Facter.stubs(:value).with(:kernel).returns("GNU/kFreeBSD")
+
+        Facter::Util::IP.get_interface_value("em0", "macaddress").should == "0:11:a:59:67:90"
+    end
 
     it "should return netmask information for HP-UX" do
         sample_output_file = File.dirname(__FILE__) + "/../data/hpux_ifconfig_single_interface"
@@ -115,7 +132,7 @@ describe Facter::Util::IP do
         Facter.stubs(:value).with(:kernel).returns("HP-UX")
 
         Facter::Util::IP.get_interface_value("lan0", "netmask").should == "255.255.255.0"
-    end 
+    end
 
     it "should return calculated network information for HP-UX" do
         sample_output_file = File.dirname(__FILE__) + "/../data/hpux_ifconfig_single_interface"
@@ -125,7 +142,7 @@ describe Facter::Util::IP do
         Facter.stubs(:value).with(:kernel).returns("HP-UX")
 
         Facter::Util::IP.get_network_value("lan0").should == "168.24.80.0"
-    end 
+    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"
@@ -175,7 +192,7 @@ describe Facter::Util::IP do
         Facter.stubs(:value).with(:kernel).returns("HP-UX")
 
         Facter::Util::IP.get_interface_value("lan0", "netmask").should == "255.255.255.0"
-    end 
+    end
 
     it "should return a human readable netmask on Darwin" do
         sample_output_file = File.dirname(__FILE__) + "/../data/darwin_ifconfig_single_interface"
@@ -187,10 +204,21 @@ describe Facter::Util::IP do
 
         Facter::Util::IP.get_interface_value("en1", "netmask").should == "255.255.255.0"
     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.new(sample_output_file).read()
+
+        Facter::Util::IP.expects(:get_single_interface_output).with("em1").returns(kfreebsd_ifconfig)
+        Facter.stubs(:value).with(:kernel).returns("GNU/kFreeBSD")
+
+        Facter::Util::IP.get_interface_value("em1", "netmask").should == "255.255.255.0"
+    end
+
     it "should not get bonding master on interface aliases" do
         Facter.stubs(:value).with(:kernel).returns("Linux")
-        
+
         Facter::Util::IP.get_bonding_master("eth0:1").should be_nil
     end
 
@@ -199,4 +227,11 @@ describe Facter::Util::IP do
             Facter::Util::IP.convert_from_hex?(platform).should == true
         end
     end
+
+    it "should return an arp address on Linux" do
+        Facter.stubs(:value).with(:kernel).returns("Linux")
+
+        Facter::Util::IP.expects(:get_arp_value).with("eth0").returns("00:00:0c:9f:f0:04")
+        Facter::Util::IP.get_arp_value("eth0").should == "00:00:0c:9f:f0:04"
+    end
 end

data/spec/unit/util/{loader.rb → loader_spec.rb}

@@ -1,9 +1,23 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 require 'facter/util/loader'
 
+
+# loader subclass for making assertions about file/directory ordering
+class TestLoader < Facter::Util::Loader
+  def loaded_files
+    @loaded_files ||= []
+  end
+
+  def load_file(file)
+    loaded_files << file
+    super
+  end
+end
+
+
 describe Facter::Util::Loader do
     def with_env(values)
         old = {}
@@ -96,6 +110,24 @@ describe Facter::Util::Loader do
             @loader.load(:testing)
         end
 
+      it 'should load any ruby files in directories matching the fact name in the search path in sorted order regardless of the order returned by Dir.entries' do
+        @loader = TestLoader.new
+
+        @loader.stubs(:search_path).returns %w{/one/dir}
+        FileTest.stubs(:exist?).returns false
+        FileTest.stubs(:directory?).with("/one/dir/testing").returns true
+        @loader.stubs(:search_path).returns %w{/one/dir}
+
+        Dir.stubs(:entries).with("/one/dir/testing").returns %w{foo.rb bar.rb}
+        %w{/one/dir/testing/foo.rb /one/dir/testing/bar.rb}.each do |f|
+          File.stubs(:directory?).with(f).returns false
+          Kernel.stubs(:load).with(f)
+        end
+
+        @loader.load(:testing)
+        @loader.loaded_files.should == %w{/one/dir/testing/bar.rb /one/dir/testing/foo.rb}
+      end
+
         it "should load any ruby files in directories matching the fact name in the search path" do
             @loader.expects(:search_path).returns %w{/one/dir}
             FileTest.stubs(:exist?).returns false
@@ -166,6 +198,24 @@ describe Facter::Util::Loader do
             @loader.load_all
         end
 
+      it 'should load all files in sorted order for any given directory regardless of the order returned by Dir.entries' do
+        @loader = TestLoader.new
+
+        @loader.stubs(:search_path).returns %w{/one/dir}
+        Dir.stubs(:entries).with("/one/dir").returns %w{foo.rb bar.rb}
+
+        %w{/one/dir}.each { |f| File.stubs(:directory?).with(f).returns true }
+
+        %w{/one/dir/foo.rb /one/dir/bar.rb}.each do |f|
+          File.stubs(:directory?).with(f).returns false
+          Kernel.expects(:load).with(f)
+        end
+
+        @loader.load_all
+
+        @loader.loaded_files.should == %w{/one/dir/bar.rb /one/dir/foo.rb}
+      end
+
         it "should not load files in the util subdirectory" do
             @loader.expects(:search_path).returns %w{/one/dir}