facter 1.6.18 → 1.7.0.rc1

data/spec/fixtures/unit/zfs_version/freebsd_8.2

@@ -0,0 +1,14 @@
+The following filesystem versions are supported:
+
+VER  DESCRIPTION
+---  --------------------------------------------------------
+ 1   Initial ZFS filesystem version
+ 2   Enhanced directory entries
+ 3   Case insensitive and File system unique identifer (FUID)
+ 4   userquota, groupquota properties
+
+For more information on a particular version, including supported releases, see:
+
+http://www.opensolaris.org/os/community/zfs/version/zpl/N
+
+Where 'N' is the version number.

data/spec/fixtures/unit/zfs_version/freebsd_9.0

@@ -0,0 +1,13 @@
+The following filesystem versions are supported:
+
+VER  DESCRIPTION
+---  --------------------------------------------------------
+ 1   Initial ZFS filesystem version
+ 2   Enhanced directory entries
+ 3   Case insensitive and File system unique identifier (FUID)
+ 4   userquota, groupquota properties
+ 5   System attributes
+
+For more information on a particular version, including supported releases,
+see the ZFS Administration Guide.
+

data/spec/fixtures/unit/zfs_version/linux-fuse_0.6.9

@@ -0,0 +1,14 @@
+The following filesystem versions are supported:
+
+VER  DESCRIPTION
+---  --------------------------------------------------------
+ 1   Initial ZFS filesystem version
+ 2   Enhanced directory entries
+ 3   Case insensitive and File system unique identifier (FUID)
+ 4   userquota, groupquota properties
+
+For more information on a particular version, including supported releases, see:
+
+http://www.opensolaris.org/os/community/zfs/version/zpl/N
+
+Where 'N' is the version number.

data/spec/fixtures/unit/zfs_version/solaris_10

@@ -0,0 +1,10 @@
+The following filesystem versions are supported:
+
+VER  DESCRIPTION
+---  --------------------------------------------------------
+ 1   Initial ZFS filesystem version
+ 2   Enhanced directory entries
+ 3   Case insensitive and SMB credentials support
+
+For more information on a particular version, including supported releases,
+see the ZFS Administration Guide.

data/spec/fixtures/unit/zfs_version/solaris_11

@@ -0,0 +1,12 @@
+The following filesystem versions are supported:
+
+VER  DESCRIPTION
+---  --------------------------------------------------------
+ 1   Initial ZFS filesystem version
+ 2   Enhanced directory entries
+ 3   Case insensitive and SMB credentials support
+ 4   userquota, groupquota properties
+ 5   System attributes
+
+For more information on a particular version, including supported releases,
+see the ZFS Administration Guide.

data/spec/fixtures/unit/zpool_version/freebsd_8.2

@@ -0,0 +1,26 @@
+This system is currently running ZFS pool version 15.
+
+The following versions are supported:
+
+VER  DESCRIPTION
+---  --------------------------------------------------------
+ 1   Initial ZFS version
+ 2   Ditto blocks (replicated metadata)
+ 3   Hot spares and double parity RAID-Z
+ 4   zpool history
+ 5   Compression using the gzip algorithm
+ 6   bootfs pool property
+ 7   Separate intent log devices
+ 8   Delegated administration
+ 9   refquota and refreservation properties
+ 10  Cache devices
+ 11  Improved scrub performance
+ 12  Snapshot properties
+ 13  snapused property
+ 14  passthrough-x aclinherit
+ 15  user/group space accounting
+For more information on a particular version, including supported releases, see:
+
+http://www.opensolaris.org/os/community/zfs/version/N
+
+Where 'N' is the version number.

data/spec/fixtures/unit/zpool_version/freebsd_9.0

@@ -0,0 +1,38 @@
+This system is currently running ZFS pool version 28.
+
+The following versions are supported:
+
+VER  DESCRIPTION
+---  --------------------------------------------------------
+ 1   Initial ZFS version
+ 2   Ditto blocks (replicated metadata)
+ 3   Hot spares and double parity RAID-Z
+ 4   zpool history
+ 5   Compression using the gzip algorithm
+ 6   bootfs pool property
+ 7   Separate intent log devices
+ 8   Delegated administration
+ 9   refquota and refreservation properties
+ 10  Cache devices
+ 11  Improved scrub performance
+ 12  Snapshot properties
+ 13  snapused property
+ 14  passthrough-x aclinherit
+ 15  user/group space accounting
+ 16  stmf property support
+ 17  Triple-parity RAID-Z
+ 18  Snapshot user holds
+ 19  Log device removal
+ 20  Compression using zle (zero-length encoding)
+ 21  Deduplication
+ 22  Received properties
+ 23  Slim ZIL
+ 24  System attributes
+ 25  Improved scrub stats
+ 26  Improved snapshot deletion performance
+ 27  Improved snapshot creation performance
+ 28  Multiple vdev replacements
+
+For more information on a particular version, including supported releases,
+see the ZFS Administration Guide.
+

data/spec/fixtures/unit/zpool_version/linux-fuse_0.6.9

@@ -0,0 +1,35 @@
+This system is currently running ZFS pool version 23.
+
+The following versions are supported:
+
+VER  DESCRIPTION
+---  --------------------------------------------------------
+ 1   Initial ZFS version
+ 2   Ditto blocks (replicated metadata)
+ 3   Hot spares and double parity RAID-Z
+ 4   zpool history
+ 5   Compression using the gzip algorithm
+ 6   bootfs pool property
+ 7   Separate intent log devices
+ 8   Delegated administration
+ 9   refquota and refreservation properties
+ 10  Cache devices
+ 11  Improved scrub performance
+ 12  Snapshot properties
+ 13  snapused property
+ 14  passthrough-x aclinherit
+ 15  user/group space accounting
+ 16  stmf property support
+ 17  Triple-parity RAID-Z
+ 18  Snapshot user holds
+ 19  Log device removal
+ 20  Compression using zle (zero-length encoding)
+ 21  Deduplication
+ 22  Received properties
+ 23  Slim ZIL
+
+For more information on a particular version, including supported releases, see:
+
+http://www.opensolaris.org/os/community/zfs/version/N
+
+Where 'N' is the version number.

data/spec/fixtures/unit/zpool_version/solaris_10

@@ -0,0 +1,31 @@
+This system is currently running ZFS pool version 22.
+
+The following versions are supported:
+
+VER  DESCRIPTION
+---  --------------------------------------------------------
+ 1   Initial ZFS version
+ 2   Ditto blocks (replicated metadata)
+ 3   Hot spares and double parity RAID-Z
+ 4   zpool history
+ 5   Compression using the gzip algorithm
+ 6   bootfs pool property
+ 7   Separate intent log devices
+ 8   Delegated administration
+ 9   refquota and refreservation properties
+ 10  Cache devices
+ 11  Improved scrub performance
+ 12  Snapshot properties
+ 13  snapused property
+ 14  passthrough-x aclinherit
+ 15  user/group space accounting
+ 16  stmf property support
+ 17  Triple-parity RAID-Z
+ 18  Snapshot user holds
+ 19  Log device removal
+ 20  Compression using zle (zero-length encoding)
+ 21  Reserved
+ 22  Received properties
+
+For more information on a particular version, including supported releases,
+see the ZFS Administration Guide.

data/spec/fixtures/unit/zpool_version/solaris_11

@@ -0,0 +1,43 @@
+zpool upgrade -v
+This system is currently running ZFS pool version 33.
+
+The following versions are supported:
+
+VER  DESCRIPTION
+---  --------------------------------------------------------
+ 1   Initial ZFS version
+ 2   Ditto blocks (replicated metadata)
+ 3   Hot spares and double parity RAID-Z
+ 4   zpool history
+ 5   Compression using the gzip algorithm
+ 6   bootfs pool property
+ 7   Separate intent log devices
+ 8   Delegated administration
+ 9   refquota and refreservation properties
+ 10  Cache devices
+ 11  Improved scrub performance
+ 12  Snapshot properties
+ 13  snapused property
+ 14  passthrough-x aclinherit
+ 15  user/group space accounting
+ 16  stmf property support
+ 17  Triple-parity RAID-Z
+ 18  Snapshot user holds
+ 19  Log device removal
+ 20  Compression using zle (zero-length encoding)
+ 21  Deduplication
+ 22  Received properties
+ 23  Slim ZIL
+ 24  System attributes
+ 25  Improved scrub stats
+ 26  Improved snapshot deletion performance
+ 27  Improved snapshot creation performance
+ 28  Multiple vdev replacements
+ 29  RAID-Z/mirror hybrid allocator
+ 30  Encryption
+ 31  Improved 'zfs list' performance
+ 32  One MB blocksize
+ 33  Improved share support
+
+For more information on a particular version, including supported releases,
+see the ZFS Administration Guide.

data/spec/integration/facter_spec.rb

@@ -24,4 +24,16 @@ describe Facter do
     Facter.reset
     Facter.collection.should_not equal(old)
   end
+
+  it "should raise an error if a recursion is detected" do
+    Facter.clear
+    Facter.add(:foo) do
+      confine :bar => 'some_value'
+    end
+    Facter.add(:bar) do
+      confine :foo => 'some_value'
+    end
+    lambda { Facter.value(:foo) }.should raise_error(RuntimeError, /Caught recursion on foo/)
+  end
+
 end

data/spec/spec_helper.rb

@@ -39,3 +39,12 @@ RSpec.configure do |config|
     to_remove.each {|key| ENV.delete key }
   end
 end
+
+module FacterSpec
+  module ConfigHelper
+    def given_a_configuration_of(config)
+      Facter::Util::Config.stubs(:is_windows?).returns(config[:is_windows])
+      Facter::Util::Config.stubs(:external_facts_dir).returns(config[:external_facts_dir] || "data_dir")
+    end
+  end
+end

data/spec/unit/architecture_spec.rb

@@ -32,7 +32,7 @@ describe "Architecture fact" do
     "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])

data/spec/unit/blockdevices_spec.rb

@@ -0,0 +1,109 @@
+#!/usr/bin/env ruby
+
+require 'spec_helper'
+require 'facter'
+require 'facter/util/nothing_loader'
+
+describe "Block device facts" do
+
+  describe "on non-Linux OS" do
+
+    it "should not exist when kernel isn't Linux" do
+      Facter.fact(:kernel).stubs(:value).returns("SunOS")
+      Facter.fact(:blockdevices).should == nil
+    end
+
+  end
+
+  describe "on Linux" do
+
+    describe "with /sys/block/" do
+
+      describe "with valid entries" do
+        before :each do
+          Facter::Util::Config.ext_fact_loader = Facter::Util::NothingLoader.new
+          Facter.fact(:kernel).stubs(:value).returns("Linux")
+          File.stubs(:exist?).with('/sys/block/').returns(true)
+
+          Dir.stubs(:entries).with("/sys/block/").returns([".", "..", "hda", "sda", "sdb"])
+
+          File.stubs(:exist?).with("/sys/block/./device").returns(false)
+          File.stubs(:exist?).with("/sys/block/../device").returns(false)
+
+          stubdevices = [
+            #device,    size,               vendor,     model
+            ["hda"],
+            ["sda",     "976773168",        "ATA",      "WDC WD5000AAKS-0"],
+            ["sdb",     "8787591168",       "DELL",     "PERC H700"]
+          ]
+
+          stubdevices.each do |device, size, vendor, model|
+            stubdir = "/sys/block/#{device}"
+            File.stubs(:exist?).with(stubdir + "/device").returns(true)
+            File.stubs(:exist?).with(stubdir + "/size").returns(size ? true : false)
+            File.stubs(:exist?).with(stubdir + "/device/model").returns(model ? true : false)
+            File.stubs(:exist?).with(stubdir + "/device/vendor").returns(vendor ? true : false)
+            IO.stubs(:read).with(stubdir + "/size").returns(size) if size
+            IO.stubs(:read).with(stubdir + "/device/vendor").returns(vendor) if vendor
+            IO.stubs(:read).with(stubdir + "/device/model").returns(model) if model
+          end
+        end
+
+        it "should report three block devices, hda, sda, and sdb, with accurate information from sda and sdb, and without invalid . or .. entries" do
+          Facter.fact(:blockdevices).value.should == "hda,sda,sdb"
+
+          # handle facts that should not exist
+          %w{ . .. hda }.each do |device|
+            Facter.fact("blockdevice_#{device}_size".to_sym).should == nil
+            Facter.fact("blockdevice_#{device}_vendor".to_sym).should == nil
+            Facter.fact("blockdevice_#{device}_model".to_sym).should == nil
+          end
+
+          # handle facts that should exist
+          %w{ sda sdb }.each do |device|
+            Facter.fact("blockdevice_#{device}_size".to_sym).should_not == nil
+            Facter.fact("blockdevice_#{device}_vendor".to_sym).should_not == nil
+            Facter.fact("blockdevice_#{device}_model".to_sym).should_not == nil
+          end
+
+          Facter.fact(:blockdevice_sda_model).value.should == "WDC WD5000AAKS-0"
+          Facter.fact(:blockdevice_sda_vendor).value.should == "ATA"
+          Facter.fact(:blockdevice_sda_size).value.should == 500107862016
+
+          Facter.fact(:blockdevice_sdb_model).value.should == "PERC H700"
+          Facter.fact(:blockdevice_sdb_vendor).value.should == "DELL"
+          Facter.fact(:blockdevice_sdb_size).value.should == 4499246678016
+
+        end
+
+      end
+      describe "with invalid entries in /sys/block" do
+        before :each do
+          Facter.fact(:kernel).stubs(:value).returns("Linux")
+          File.stubs(:exist?).with('/sys/block/').returns(true)
+
+          Dir.stubs(:entries).with("/sys/block/").returns([".", "..", "xda", "ydb"])
+
+          File.stubs(:exist?).with("/sys/block/./device").returns(false)
+          File.stubs(:exist?).with("/sys/block/../device").returns(false)
+          File.stubs(:exist?).with("/sys/block/xda/device").returns(false)
+          File.stubs(:exist?).with("/sys/block/ydb/device").returns(false)
+        end
+
+        it "should not exist with invalid entries in /sys/block" do
+          Facter.fact(:blockdevices).should == nil
+        end
+      end
+    end
+    describe "without /sys/block/" do
+
+      it "should not exist without /sys/block/ on Linux" do
+        Facter.fact(:kernel).stubs(:value).returns("Linux")
+        File.stubs(:exist?).with('/sys/block/').returns(false)
+        Facter.fact(:blockdevices).should == nil
+      end
+
+    end
+
+  end
+end

data/spec/unit/domain_spec.rb

@@ -4,121 +4,160 @@ require 'spec_helper'
 
 describe "Domain name facts" do
 
-  describe "on linux" do
-    before do
-      Facter.fact(:kernel).stubs(:value).returns("Linux")
-      FileTest.stubs(:exists?).with("/etc/resolv.conf").returns(true)
-    end
-
-    it "should use the hostname binary" do
-      Facter::Util::Resolution.expects(:exec).with("hostname").returns "test.example.com"
-      Facter.fact(:domain).value.should == "example.com"
-    end
-
-    it "should fall back to the dnsdomainname binary" do
-      Facter::Util::Resolution.expects(:exec).with("hostname").returns("myhost")
-      Facter::Util::Resolution.expects(:exec).with("dnsdomainname").returns("example.com")
-      Facter.fact(:domain).value.should == "example.com"
-    end
-
-
-    it "should fall back to /etc/resolv.conf" do
-      Facter::Util::Resolution.expects(:exec).with("hostname").at_least_once.returns("myhost")
-      Facter::Util::Resolution.expects(:exec).with("dnsdomainname").at_least_once.returns("")
-      File.expects(:open).with('/etc/resolv.conf').at_least_once
-      Facter.fact(:domain).value
-    end
-
-    it "should attempt to resolve facts in a specific order" do
-      seq = sequence('domain')
-      Facter::Util::Resolution.stubs(:exec).with("hostname").in_sequence(seq).at_least_once
-      Facter::Util::Resolution.stubs(:exec).with("dnsdomainname").in_sequence(seq).at_least_once
-      File.expects(:open).with('/etc/resolv.conf').in_sequence(seq).at_least_once
-      Facter.fact(:domain).value
-    end
-
-    describe "when using /etc/resolv.conf" do
+  { :linux => {:kernel => "Linux", :hostname_command => "hostname -f"},
+    :solaris => {:kernel => "SunOS", :hostname_command => "hostname"},
+    :darwin => {:kernel => "Darwin", :hostname_command => "hostname -f"},
+    :freebsd => {:kernel => "FreeBSD", :hostname_command => "hostname -f"},
+    :hpux => {:kernel => "HP-UX", :hostname_command => "hostname"},
+  }.each do |key, nested_hash|
+
+    describe "on #{key}" do
       before do
-        Facter::Util::Resolution.stubs(:exec).with("hostname")
-        Facter::Util::Resolution.stubs(:exec).with("dnsdomainname")
-        @mock_file = mock()
-        File.stubs(:open).with("/etc/resolv.conf").yields(@mock_file)
+        Facter.fact(:kernel).stubs(:value).returns(nested_hash[:kernel])
+        FileTest.stubs(:exists?).with("/etc/resolv.conf").returns(true)
       end
-
-      it "should use the domain field over the search field" do
-        lines = [
-          "nameserver 4.2.2.1",
-          "search example.org",
-          "domain example.com",
-        ]
-        @mock_file.expects(:each).multiple_yields(*lines)
-        Facter.fact(:domain).value.should == 'example.com'
+      
+      let :hostname_command do 
+        nested_hash[:hostname_command]
+      end 
+      
+      it "should use the hostname binary" do
+        Facter::Util::Resolution.expects(:exec).with(hostname_command).returns "test.example.com"
+        Facter.fact(:domain).value.should == "example.com"
       end
-
-      it "should fall back to the search field" do
-        lines = [
-          "nameserver 4.2.2.1",
-          "search example.org",
-        ]
-        @mock_file.expects(:each).multiple_yields(*lines)
-        Facter.fact(:domain).value.should == 'example.org'
+      
+      it "should fall back to the dnsdomainname binary" do
+        Facter::Util::Resolution.expects(:exec).with(hostname_command).returns("myhost")
+        Facter::Util::Resolution.expects(:exec).with("dnsdomainname").returns("example.com")
+        Facter.fact(:domain).value.should == "example.com"
       end
-
-      it "should use the first domain in the search field" do
-        lines = [
-          "search example.org example.net",
-        ]
-        @mock_file.expects(:each).multiple_yields(*lines)
-        Facter.fact(:domain).value.should == 'example.org'
+      
+      
+      it "should fall back to /etc/resolv.conf" do
+        Facter::Util::Resolution.expects(:exec).with(hostname_command).at_least_once.returns("myhost")
+        Facter::Util::Resolution.expects(:exec).with("dnsdomainname").at_least_once.returns("")
+        File.expects(:open).with('/etc/resolv.conf').at_least_once
+        Facter.fact(:domain).value
+      end
+      
+      it "should attempt to resolve facts in a specific order" do
+        seq = sequence('domain')
+        Facter::Util::Resolution.stubs(:exec).with(hostname_command).in_sequence(seq).at_least_once
+        Facter::Util::Resolution.stubs(:exec).with("dnsdomainname").in_sequence(seq).at_least_once
+        File.expects(:open).with('/etc/resolv.conf').in_sequence(seq).at_least_once
+        Facter.fact(:domain).value
       end
+      
+      describe "Top level domain" do 
+        it "should find the domain name" do
+          Facter::Util::Resolution.expects(:exec).with(hostname_command).returns "ns01.tld"
+          Facter::Util::Resolution.expects(:exec).with("dnsdomainname").never
+          File.expects(:exists?).with('/etc/resolv.conf').never
+          Facter.fact(:domain).value.should == "tld" 
+        end  
+      end 
+      
+      describe "when using /etc/resolv.conf" do
+        before do
+          Facter::Util::Resolution.stubs(:exec).with(hostname_command)
+          Facter::Util::Resolution.stubs(:exec).with("dnsdomainname")
+          @mock_file = mock()
+          File.stubs(:open).with("/etc/resolv.conf").yields(@mock_file)
+        end
+        
+        it "should use the domain field over the search field" do
+          lines = [
+                   "nameserver 4.2.2.1",
+                   "search example.org",
+                   "domain example.com",
+                  ]
+          @mock_file.expects(:each).multiple_yields(*lines)
+          Facter.fact(:domain).value.should == 'example.com'
+        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
+        it "should fall back to the search field" do
           lines = [
-            field
-          ].flatten
+                   "nameserver 4.2.2.1",
+                   "search example.org",
+                  ]
           @mock_file.expects(:each).multiple_yields(*lines)
-          Facter.fact(:domain).value.should == expect
+          Facter.fact(:domain).value.should == 'example.org'
+        end
+        
+        it "should use the first domain in the search field" do
+          lines = [
+                   "search example.org example.net",
+                  ]
+          @mock_file.expects(:each).multiple_yields(*lines)
+          Facter.fact(:domain).value.should == 'example.org'
+        end
+        
+        # Test permutations of domain and search, where 'domain' can be a value of
+        # the search keyword and the domain keyword
+        # and also where 'search' can be a value of the search keyword and the
+        # domain keyword
+        # For example, /etc/resolv.conf may look like:
+        #     domain domain
+        # or
+        #     search search
+        # or
+        #     domain search
+        #
+        #
+        # Why someone would have their machines named 'www.domain' or 'www.search', I
+        # don't know, but we'll at least handle it properly
+        [
+         ["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
-  end
+  end 
 
   describe "on Windows" do
     before(:each) do
       Facter.fact(:kernel).stubs(:value).returns("windows")
       require 'facter/util/registry'
     end
+
     describe "with primary dns suffix" do
       before(:each) do
         Facter::Util::Registry.stubs(:hklm_read).returns('baz.com')
       end
+
       it "should get the primary dns suffix" do
         Facter.fact(:domain).value.should == 'baz.com'
       end
+
       it "should not execute the wmi query" do
         require 'facter/util/wmi'
         Facter::Util::WMI.expects(:execquery).never
         Facter.fact(:domain).value
       end
     end
+
     describe "without primary dns suffix" do
       before(:each) do
         Facter::Util::Registry.stubs(:hklm_read).returns('')
       end
+
       it "should use the DNSDomain for the first nic where ip is enabled" do
         nic = stubs 'nic'
         nic.stubs(:DNSDomain).returns("foo.com")
@@ -133,4 +172,73 @@ describe "Domain name facts" do
       end
     end
   end
+
+  describe "with trailing dots" do 
+    describe "on Windows" do 
+      before do
+        Facter.fact(:kernel).stubs(:value).returns("windows")
+        require 'facter/util/registry'
+        require 'facter/util/wmi'
+      end
+ 
+      [{:registry => 'testdomain.', :wmi => '', :expect => 'testdomain'},
+       {:registry => '', :wmi => 'testdomain.', :expect => 'testdomain'},
+      ].each do |scenario|
+
+        describe "scenarios" do 
+          before(:each) do
+            Facter::Util::Registry.stubs(:hklm_read).returns(scenario[:registry])
+            nic = stubs 'nic'
+            nic.stubs(:DNSDomain).returns(scenario[:wmi])
+            Facter::Util::WMI.stubs(:execquery).with("select DNSDomain from Win32_NetworkAdapterConfiguration where IPEnabled = True").returns([nic])
+          end
+ 
+          it "should return #{scenario[:expect]}" do
+            Facter.fact(:domain).value.should == scenario[:expect]
+          end
+ 
+          it "should remove trailing dots"  do
+            Facter.fact(:domain).value.should_not =~ /\.$/
+          end
+        end 
+      end 
+    end
+
+    describe "on everything else" do
+      before do
+        Facter.fact(:kernel).stubs(:value).returns("Linux")
+        FileTest.stubs(:exists?).with("/etc/resolv.conf").returns(true)
+      end
+
+      [{:hostname => 'host.testdomain.', :dnsdomainname => '', :resolve_domain => '', :resolve_search => '', :expect => 'testdomain'},
+       {:hostname => '', :dnsdomainname => 'testdomain.', :resolve_domain => '', :resolve_search => '', :expect => 'testdomain'},
+       {:hostname => '', :dnsdomainname => '', :resolve_domain => 'testdomain.', :resolve_search => '', :expect => 'testdomain'},
+       {:hostname => '', :dnsdomainname => '', :resolve_domain => '', :resolve_search => 'testdomain.', :expect => 'testdomain'}, 
+       {:hostname => '', :dnsdomainname => '', :resolve_domain => '', :resolve_search => '', :expect => nil}
+      ].each do |scenario|
+
+        describe "scenarios" do
+          before(:each) do 
+            Facter::Util::Resolution.stubs(:exec).with("hostname -f").returns(scenario[:hostname])
+            Facter::Util::Resolution.stubs(:exec).with("dnsdomainname").returns(scenario[:dnsdomainname])
+            @mock_file = mock()
+            File.stubs(:open).with("/etc/resolv.conf").yields(@mock_file)
+            lines = [
+                     "search #{scenario[:resolve_search]}",
+                     "domain #{scenario[:resolve_domain]}",
+                    ]
+            @mock_file.stubs(:each).multiple_yields(*lines)
+          end
+
+          it "should remove trailing dots" do
+            Facter.fact(:domain).value.should_not =~ /\.$/
+          end
+
+          it "should return #{scenario[:expect]}" do
+            Facter.fact(:domain).value.should == scenario[:expect]
+          end
+        end
+      end      
+    end
+  end
 end