facter 2.4.4 → 2.4.5

data/lib/facter/core/execution/posix.rb

@@ -11,11 +11,11 @@ class Facter::Core::Execution::Posix < Facter::Core::Execution::Base
 
   def which(bin)
     if absolute_path?(bin)
-      return bin if File.executable?(bin)
+      return bin if File.executable?(bin) and File.file?(bin)
     else
       search_paths.each do |dir|
         dest = File.join(dir, bin)
-        return dest if File.executable?(dest)
+        return dest if File.executable?(dest) and File.file?(dest)
       end
     end
     nil

data/lib/facter/gid.rb

@@ -10,7 +10,7 @@
 
 Facter.add(:gid) do
   confine do
-    Facter::Core::Execution.which('id') && Facter.value(:kernel) != "SunOS"
+    Facter::Core::Execution.which('id') && !["SunOS", "windows"].include?(Facter.value(:kernel))
   end
   setcode { Facter::Core::Execution.exec('id -ng') }
 end

data/lib/facter/ipaddress.rb

@@ -3,7 +3,9 @@
 # Purpose: Return the main IP address for a host.
 #
 # Resolution:
-#   On the Unixes does an ifconfig, and returns the first non 127.0.0.0/8
+#   On Linux and AIX, it examines the routing table and uses the IP address
+#   of the default interface.
+#   On other Unixes does an ifconfig, and returns the first non 127.0.0.0/8
 #   subnetted IP it finds.
 #   On Windows, it attempts to use the socket library and resolve the machine's
 #   hostname via DNS.
@@ -27,19 +29,8 @@ require 'facter/util/ip'
 Facter.add(:ipaddress) do
   confine :kernel => :linux
   setcode do
-    ip = nil
-    output = Facter::Util::IP.exec_ifconfig(["2>/dev/null"])
-    if output
-      regexp = /inet (?:addr:)?([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
-      output.split("\n").each do |line|
-        match = regexp.match(line)
-        if match and not /^127\./.match(match[1])
-          ip = match[1]
-          break
-        end
-      end
-    end
-    ip
+    iface = Facter::Util::IP.linux_default_iface
+    Facter.value("ipaddress_#{iface}")
   end
 end
 

data/lib/facter/ipaddress6.rb

@@ -37,11 +37,12 @@ def get_address_after_token(output, token, return_first=false)
   ip
 end
 
+
 Facter.add(:ipaddress6) do
   confine :kernel => :linux
   setcode do
-    output = Facter::Util::IP.exec_ifconfig(["2>/dev/null"])
-    get_address_after_token(output, 'inet6(?: addr:)?')
+    iface = Facter::Util::IP.linux_default_iface
+    Facter.value("ipaddress6_#{iface}")
   end
 end
 

data/lib/facter/macaddress.rb

@@ -12,15 +12,10 @@ require 'facter/util/macaddress'
 require 'facter/util/ip'
 
 Facter.add(:macaddress) do
-  confine :kernel => 'Linux'
+  confine :kernel => :linux
   setcode do
-    ether = []
-    output = Facter::Util::IP.exec_ifconfig(["-a","2>/dev/null"])
-
-    String(output).each_line do |s|
-      ether.push($1) if s =~ /(?:ether|HWaddr) ((\w{1,2}:){5,}\w{1,2})/
-    end
-    Facter::Util::Macaddress.standardize(ether[0])
+    iface = Facter::Util::IP.linux_default_iface
+    Facter.value("macaddress_#{iface}")
   end
 end
 

data/lib/facter/netmask.rb

@@ -16,8 +16,16 @@
 #
 require 'facter/util/netmask'
 
+Facter.add(:netmask) do
+  confine :kernel => :linux
+  setcode do
+    iface = Facter::Util::IP.linux_default_iface
+    Facter.value("netmask_#{iface}")
+  end
+end
+
 Facter.add("netmask") do
-  confine :kernel => [ :sunos, :linux, :freebsd, :openbsd, :netbsd, :darwin, :"gnu/kfreebsd", :dragonfly, :AIX ]
+  confine :kernel => [ :sunos, :freebsd, :openbsd, :netbsd, :darwin, :"gnu/kfreebsd", :dragonfly, :AIX ]
   setcode do
     Facter::NetMask.get_netmask
   end

data/lib/facter/processors/os.rb

@@ -112,7 +112,7 @@ module Facter
         # get each physical processor
         Facter::Util::WMI.execquery("select * from Win32_Processor").each do |proc|
           # not supported before 2008
-          if proc.respond_to?(:NumberOfLogicalProcessors)
+          if proc.ole_respond_to?(:NumberOfLogicalProcessors)
             processor_num = proc.NumberOfLogicalProcessors
           else
             processor_num = 1

data/lib/facter/util/ip.rb

@@ -337,4 +337,21 @@ module Facter::Util::IP
       network = ip.mask(subnet.to_s).to_s
     end
   end
+
+  def self.read_proc_net_route
+    File.read("/proc/net/route")
+  end
+
+  def self.linux_default_iface
+    routes = read_proc_net_route
+    iface = nil
+    routes.split("\n").each do |line|
+      parts = line.split
+      if parts[1] == "00000000"
+        iface = alphafy(parts[0])
+        break
+      end
+    end
+    iface
+  end
 end

data/lib/facter/util/netmask.rb

@@ -5,12 +5,6 @@ module Facter::NetMask
 
     ops = nil
     case Facter.value(:kernel)
-    when 'Linux'
-      ops = {
-        :ifconfig_opts => ['2>/dev/null'],
-        :regex => %r{#{Facter.value(:ipaddress)}.*?(?:Mask:|netmask)\s*(#{ipregex})}x,
-        :munge => nil,
-      }
     when 'SunOS'
       ops = {
         :ifconfig_opts => ['-a'],

data/lib/facter/util/virtual.rb

@@ -162,7 +162,7 @@ module Facter::Util::Virtual
     path = Pathname.new('/proc/1/cgroup')
     return false unless path.readable?
     begin
-      in_lxc = path.readlines.any? {|l| l.split(":")[2].to_s.start_with? '/lxc/' }
+      in_lxc = path.readlines.any? {|l| l.split(":")[2].to_s.include? '/lxc' }
     rescue Errno::EPERM => exc
       # If we get "operation not permitted" here, it probably means we are
       # running OpenVZ. We are not running LXC anyway, so...
@@ -179,7 +179,7 @@ module Facter::Util::Virtual
     path = Pathname.new('/proc/1/cgroup')
     return false unless path.readable?
     begin
-      in_docker = path.readlines.any? {|l| l.split(":")[2].to_s.start_with? '/docker/' }
+      in_docker = path.readlines.any? {|l| l.split(":")[2].to_s.include? '/docker' }
     rescue Errno::EPERM => exc
       # This can fail under OpenVZ, just like in .lxc?
       return false

data/lib/facter/version.rb

@@ -1,6 +1,6 @@
 module Facter
   if not defined? FACTERVERSION then
-    FACTERVERSION = '2.4.4'
+    FACTERVERSION = '2.4.5'
   end
 
   # Returns the running version of Facter.

data/spec/fixtures/ifconfig/net_route_all_with_multiple_interfaces

@@ -0,0 +1,2 @@
+eth0    00000000        01D1FC83        0003    0       0       100     00000000        0       0       0                                                                          
+eth0    01D1FC83        00000000        0001    0       0       100     00FFFFFF        0       0       0                                                                          

data/spec/fixtures/ifconfig/net_route_net_tools_1.60.txt

@@ -0,0 +1,3 @@
+Iface   Destination     Gateway         Flags   RefCnt  Use     Metric  Mask            MTU     Window  IRTT
+em1     00000000        99D1FC83        0003    0       0       100     00000000        0       0       0
+em1     99D1FC83        99D1FC83        0007    0       0       100     FFFFFFFF        0       0       0                                                                          

data/spec/fixtures/unit/ipaddress/net_route_multiple_127_addresses.txt

@@ -0,0 +1,3 @@
+Iface   Destination     Gateway         Flags   RefCnt  Use     Metric  Mask            MTU     Window  IRTT
+venet0:1 00000000        1400DE0A        0003    0       0       100     00000000        0       0       0
+venet0:1 1400DE0A        1400DE0A        0007    0       0       100     FFFFFFFF        0       0       0                                                                          

data/spec/fixtures/unit/ipaddress/net_route_net_tools_1.60.txt

@@ -0,0 +1,3 @@
+Iface   Destination     Gateway         Flags   RefCnt  Use     Metric  Mask            MTU     Window  IRTT
+em1     00000000        99D1FC83        0003    0       0       100     00000000        0       0       0
+em1     99D1FC83        99D1FC83        0007    0       0       100     FFFFFFFF        0       0       0                                                                          

data/spec/fixtures/unit/ipaddress/net_route_non_english_locale.txt

@@ -0,0 +1,3 @@
+Iface   Destination     Gateway         Flags   RefCnt  Use     Metric  Mask            MTU     Window  IRTT
+wlan0   00000000        5301A8C0        0003    0       0       100     00000000        0       0       0
+wlan0   5301A8C0        5301A8C0        0007    0       0       100     FFFFFFFF        0       0       0                                

data/spec/fixtures/unit/ipaddress/net_route_ubuntu_1204.txt

@@ -0,0 +1,3 @@
+Iface   Destination     Gateway         Flags   RefCnt  Use     Metric  Mask            MTU     Window  IRTT                                                       
+eth0    00000000        6E50570A        0003    0       0       100     00000000        0       0       0                                                                          
+eth0    6E50570A        6E50570A        0007    0       0       100     FFFFFFFF        0       0       0                                                                          

data/spec/fixtures/unit/netmask/net_route_multiple_127_addresses.txt

@@ -0,0 +1,3 @@
+Iface   Destination     Gateway         Flags   RefCnt  Use     Metric  Mask            MTU     Window  IRTT
+venet0:1 00000000        1400DE0A        0003    0       0       100     00000000        0       0       0
+venet0:1 1400DE0A        1400DE0A        0007    0       0       100     FFFFFFFF        0       0       0                                                                          

data/spec/fixtures/unit/netmask/net_route_net_tools_1.60.txt

@@ -0,0 +1,3 @@
+Iface   Destination     Gateway         Flags   RefCnt  Use     Metric  Mask            MTU     Window  IRTT
+em1     00000000        99D1FC83        0003    0       0       100     00000000        0       0       0
+em1     99D1FC83        99D1FC83        0007    0       0       100     FFFFFFFF        0       0       0                                                                          

data/spec/fixtures/unit/netmask/net_route_non_english_locale.txt

@@ -0,0 +1,3 @@
+Iface   Destination     Gateway         Flags   RefCnt  Use     Metric  Mask            MTU     Window  IRTT
+wlan0   00000000        5301A8C0        0003    0       0       100     00000000        0       0       0
+wlan0   5301A8C0        5301A8C0        0007    0       0       100     FFFFFFFF        0       0       0                                

data/spec/fixtures/unit/netmask/net_route_ubuntu_1204.txt

@@ -0,0 +1,3 @@
+Iface   Destination     Gateway         Flags   RefCnt  Use     Metric  Mask            MTU     Window  IRTT                                                       
+eth0    00000000        6E50570A        0003    0       0       100     00000000        0       0       0                                                                          
+eth0    6E50570A        6E50570A        0007    0       0       100     FFFFFFFF        0       0       0                                                                          

data/spec/fixtures/virtual/proc_1_cgroup/in_a_docker_container_with_systemd_slices

@@ -0,0 +1,10 @@
+10:hugetlb:/
+9:perf_event:/
+8:blkio:/system.slice/docker-8255e18aa44c5809a33db5f324a4b34e3a73b246394e4070cff752cd84d79a6d.scope
+7:net_cls:/
+6:freezer:/system.slice/docker-8255e18aa44c5809a33db5f324a4b34e3a73b246394e4070cff752cd84d79a6d.scope
+5:devices:/system.slice/docker-8255e18aa44c5809a33db5f324a4b34e3a73b246394e4070cff752cd84d79a6d.scope
+4:memory:/system.slice/docker-8255e18aa44c5809a33db5f324a4b34e3a73b246394e4070cff752cd84d79a6d.scope
+3:cpuacct,cpu:/system.slice/docker-8255e18aa44c5809a33db5f324a4b34e3a73b246394e4070cff752cd84d79a6d.scope
+2:cpuset:/system.slice/docker-8255e18aa44c5809a33db5f324a4b34e3a73b246394e4070cff752cd84d79a6d.scope
+1:name=systemd:/system.slice/docker-8255e18aa44c5809a33db5f324a4b34e3a73b246394e4070cff752cd84d79a6d.scope

data/spec/unit/core/execution/posix_spec.rb

@@ -16,6 +16,7 @@ describe Facter::Core::Execution::Posix, :unless => Facter::Util::Config.is_wind
 
     context "and provided with an absolute path" do
       it "should return the binary if executable" do
+        File.expects(:file?).with('/opt/foo').returns true
         File.expects(:executable?).with('/opt/foo').returns true
         subject.which('/opt/foo').should == '/opt/foo'
       end
@@ -24,12 +25,21 @@ describe Facter::Core::Execution::Posix, :unless => Facter::Util::Config.is_wind
         File.expects(:executable?).with('/opt/foo').returns false
         subject.which('/opt/foo').should be_nil
       end
+
+      it "should return nil if the binary is not a file" do
+        File.expects(:file?).with('/opt/foo').returns false
+        File.expects(:executable?).with('/opt/foo').returns true
+        subject.which('/opt/foo').should be_nil
+      end
     end
 
     context "and not provided with an absolute path" do
       it "should return the absolute path if found" do
+        File.expects(:file?).with('/bin/foo').never
         File.expects(:executable?).with('/bin/foo').returns false
+        File.expects(:file?).with('/sbin/foo').returns true
         File.expects(:executable?).with('/sbin/foo').returns true
+        File.expects(:file?).with('/usr/sbin/foo').never
         File.expects(:executable?).with('/usr/sbin/foo').never
         subject.which('foo').should == '/sbin/foo'
       end

data/spec/unit/gid_spec.rb

@@ -39,4 +39,13 @@ describe "gid fact" do
       Facter.fact(:gid).value.should == nil
     end
   end
+
+  describe "on windows systems" do
+    it "is not supported" do
+      Facter.fact(:kernel).stubs(:value).returns("windows")
+      Facter::Core::Execution.expects(:which).with('id').returns(true)
+
+      Facter.fact(:gid).value.should == nil
+    end
+  end
 end

data/spec/unit/ipaddress6_spec.rb

@@ -26,8 +26,11 @@ describe "The IPv6 address fact" do
   it "should return ipaddress6 information for Linux" do
     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"]).
+    Facter::Util::IP.stubs(:exec_ifconfig).
       returns(ifconfig_fixture('linux_ifconfig_all_with_multiple_interfaces'))
+    routes = ifconfig_fixture('net_route_all_with_multiple_interfaces')
+    Facter::Util::IP.stubs(:read_proc_net_route).returns(routes)
+    Facter.collection.internal_loader.load(:interfaces)
 
     Facter.value(:ipaddress6).should == "2610:10:20:209:212:3fff:febe:2201"
   end
@@ -35,8 +38,11 @@ describe "The IPv6 address fact" do
   it "should return ipaddress6 information for Linux with recent net-tools" do
     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"]).
+    Facter::Util::IP.stubs(:exec_ifconfig).
       returns(ifconfig_fixture('ifconfig_net_tools_1.60.txt'))
+    routes = ifconfig_fixture('net_route_net_tools_1.60.txt')
+    Facter::Util::IP.stubs(:read_proc_net_route).returns(routes)
+    Facter.collection.internal_loader.load(:interfaces)
 
     Facter.value(:ipaddress6).should == "2610:10:20:209:212:3fff:febe:2201"
   end
@@ -44,8 +50,11 @@ describe "The IPv6 address fact" do
   it "should return ipaddress6 with fe80 in any other octet than the first for Linux" do
     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"]).
+    Facter::Util::IP.stubs(:exec_ifconfig).
       returns(ifconfig_fixture('linux_ifconfig_all_with_multiple_interfaces_and_fe80'))
+    routes = ifconfig_fixture('net_route_all_with_multiple_interfaces')
+    Facter::Util::IP.stubs(:read_proc_net_route).returns(routes)
+    Facter.collection.internal_loader.load(:interfaces)
 
     Facter.value(:ipaddress6).should == "2610:10:20:209:212:3fff:fe80:2201"
   end
@@ -53,8 +62,11 @@ describe "The IPv6 address fact" do
   it "should not return ipaddress6 link-local address for Linux" do
     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"]).
+    Facter::Util::IP.stubs(:exec_ifconfig).
       returns(ifconfig_fixture('linux_ifconfig_all_with_multiple_interfaces_and_no_public_ipv6'))
+    routes = ifconfig_fixture('net_route_all_with_multiple_interfaces')
+    Facter::Util::IP.stubs(:read_proc_net_route).returns(routes)
+    Facter.collection.internal_loader.load(:interfaces)
 
     Facter.value(:ipaddress6).should be_false
   end

data/spec/unit/ipaddress_spec.rb

@@ -4,10 +4,6 @@ require 'spec_helper'
 require 'facter/util/ip'
 
 describe "ipaddress fact" do
-  before do
-    Facter.collection.internal_loader.load(:ipaddress)
-  end
-
   context 'using `ifconfig`' do
     before :each do
       Facter.fact(:hostname).stubs(:value)
@@ -18,25 +14,29 @@ describe "ipaddress fact" do
         Facter.fact(:kernel).stubs(:value).returns("Linux")
       end
 
+      after :each do
+        Facter.collection.flush
+      end
+
       def expect_ifconfig_parse(address, fixture)
-        Facter::Util::IP.stubs(:exec_ifconfig).returns(my_fixture_read(fixture))
+        Facter::Util::IP.stubs(:exec_ifconfig).returns(my_fixture_read("ifconfig_#{fixture}"))
+        routes = my_fixture_read("net_route_#{fixture}")
+        Facter::Util::IP.stubs(:read_proc_net_route).returns(routes)
+        Facter.collection.internal_loader.load(:interfaces)
+        Facter.collection.internal_loader.load(:ipaddress)
         Facter.fact(:ipaddress).value.should == address
       end
 
       it "parses correctly on Ubuntu 12.04" do
-        expect_ifconfig_parse "10.87.80.110", "ifconfig_ubuntu_1204.txt"
+        expect_ifconfig_parse "10.87.80.110", "ubuntu_1204.txt"
       end
 
       it "parses correctly on Fedora 17" do
-        expect_ifconfig_parse "131.252.209.153", "ifconfig_net_tools_1.60.txt"
-      end
-
-      it "parses a real address over multiple loopback addresses" do
-        expect_ifconfig_parse "10.0.222.20", "ifconfig_multiple_127_addresses.txt"
+        expect_ifconfig_parse "131.252.209.153", "net_tools_1.60.txt"
       end
 
       it "parses nothing with a non-english locale" do
-        expect_ifconfig_parse nil, "ifconfig_non_english_locale.txt"
+        expect_ifconfig_parse nil, "non_english_locale.txt"
       end
     end
   end

data/spec/unit/macaddress_spec.rb

@@ -23,8 +23,11 @@ describe "macaddress fact" do
     end
 
     it "should return the macaddress of the first interface" do
-      Facter::Util::IP.stubs(:exec_ifconfig).with(["-a","2>/dev/null"]).
+      Facter::Util::IP.stubs(:exec_ifconfig).
         returns(ifconfig_fixture('linux_ifconfig_all_with_multiple_interfaces'))
+      routes = ifconfig_fixture("net_route_all_with_multiple_interfaces")
+      Facter::Util::IP.stubs(:read_proc_net_route).returns(routes)
+      Facter.collection.internal_loader.load(:interfaces)
 
       Facter.value(:macaddress).should == "00:12:3f:be:22:01"
     end
@@ -32,6 +35,7 @@ describe "macaddress fact" do
     it "should return nil when no macaddress can be found" do
       Facter::Util::IP.stubs(:exec_ifconfig).with(["-a","2>/dev/null"]).
         returns(ifconfig_fixture('linux_ifconfig_no_mac'))
+      Facter::Util::IP.stubs(:read_proc_net_route).returns("")
 
       proc { Facter.value(:macaddress) }.should_not raise_error
       Facter.value(:macaddress).should be_nil
@@ -41,6 +45,7 @@ describe "macaddress fact" do
     it "should return nil when no interface has a real macaddress" do
       Facter::Util::IP.stubs(:exec_ifconfig).with(["-a","2>/dev/null"]).
         returns(ifconfig_fixture('linux_ifconfig_venet'))
+      Facter::Util::IP.stubs(:read_proc_net_route).returns("")
 
       proc { Facter.value(:macaddress) }.should_not raise_error
       Facter.value(:macaddress).should be_nil

data/spec/unit/netmask_spec.rb

@@ -6,8 +6,21 @@ require 'facter/util/ip'
 
 shared_examples_for "netmask from ifconfig output" do |platform, address, fixture|
   it "correctly on #{platform}" do
-    Facter::Util::IP.stubs(:exec_ifconfig).returns(my_fixture_read(fixture))
+    Facter::Util::IP.stubs(:exec_ifconfig).returns(my_fixture_read("ifconfig_#{fixture}"))
     Facter.collection.internal_loader.load(:netmask)
+    begin
+      routes = my_fixture_read("net_route_#{fixture}")
+      Facter::Util::IP.stubs(:read_proc_net_route).returns(routes)
+    rescue RuntimeError
+      # We want to try to load proc/net/route fixtures, but skip if
+      # they don't exist for non-linux platforms. Ideally we'd get an
+      # IOError here, but the fixture machinery here is dumb and
+      # converts this to a RuntimeError. Hopefully anything that would
+      # error here would also cause the actual test to fail, so I'm
+      # not going to worry too hard.
+    end
+    Facter.collection.internal_loader.load(:interfaces)
+    Facter.collection.internal_loader.load(:ipaddress)
 
     Facter.fact(:netmask).value.should eq(address)
   end
@@ -21,10 +34,10 @@ describe "The netmask fact" do
 
     example_behavior_for "netmask from ifconfig output",
       "Archlinux (net-tools 1.60)", "255.255.255.0",
-      "ifconfig_net_tools_1.60.txt"
+      "net_tools_1.60.txt"
     example_behavior_for "netmask from ifconfig output",
       "Ubuntu 12.04", "255.255.255.255",
-      "ifconfig_ubuntu_1204.txt"
+      "ubuntu_1204.txt"
   end
 
   context "on AIX" do
@@ -34,7 +47,7 @@ describe "The netmask fact" do
 
     example_behavior_for "netmask from ifconfig output",
       "AIX 7", "255.255.255.0",
-      "ifconfig_aix_7.txt"
+      "aix_7.txt"
 
   end
 

data/spec/unit/processors/os_spec.rb

@@ -221,6 +221,7 @@ describe Facter::Processors::Windows do
       before :each do
         proc = stubs 'proc'
         proc.stubs(:Name).returns("Intel(R)    Celeron(R)   processor")
+        proc.stubs(:ole_respond_to?).with(:NumberOfLogicalProcessors).returns(false)
         load(Array.new(2, proc))
       end
 
@@ -235,6 +236,7 @@ describe Facter::Processors::Windows do
       before :each do
         proc = stubs 'proc'
         proc.stubs(:NumberOfLogicalProcessors).returns(2)
+        proc.stubs(:ole_respond_to?).with(:NumberOfLogicalProcessors).returns(true)
         proc.stubs(:Name).returns("Intel(R)    Celeron(R)   processor")
         load(Array.new(2, proc))
       end

data/spec/unit/util/virtual_spec.rb

@@ -368,6 +368,17 @@ describe Facter::Util::Virtual do
       end
     end
 
+    context '/proc/1/cgroup has at least one hierarchy with docker underneath a systemd slice parent' do
+      before :each do
+        fakepath = Pathname.new(File.join(fixture_path, 'in_a_docker_container_with_systemd_slices'))
+        Pathname.stubs(:new).with('/proc/1/cgroup').returns(fakepath)
+      end
+
+      it 'is true' do
+        subject.should be_true
+      end
+    end
+
     context '/proc/1/cgroup has no hierarchies rooted in /docker/' do
       before :each do
         fakepath = Pathname.new(File.join(fixture_path, 'not_in_a_container'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies: []
 description: You can prove anything with facts!
 email: info@puppetlabs.com
@@ -201,6 +201,7 @@ files:
 - spec/fixtures/cpuinfo/two_multicore-grep
 - spec/fixtures/virtual/proc_1_cgroup/in_a_container
 - spec/fixtures/virtual/proc_1_cgroup/not_in_a_container
+- spec/fixtures/virtual/proc_1_cgroup/in_a_docker_container_with_systemd_slices
 - spec/fixtures/virtual/proc_1_cgroup/in_a_docker_container
 - spec/fixtures/virtual/proc_self_status/vserver_2_1/guest
 - spec/fixtures/virtual/proc_self_status/vserver_2_1/host
@@ -219,8 +220,12 @@ files:
 - spec/fixtures/processorcount/solaris-psrinfo
 - spec/fixtures/unit/netmask/ifconfig_ubuntu_1204.txt
 - spec/fixtures/unit/netmask/ifconfig_net_tools_1.60.txt
+- spec/fixtures/unit/netmask/net_route_ubuntu_1204.txt
+- spec/fixtures/unit/netmask/net_route_multiple_127_addresses.txt
 - spec/fixtures/unit/netmask/ifconfig_aix_7.txt
-- spec/fixtures/unit/netmask/darwin_10_8_5.txt
+- spec/fixtures/unit/netmask/net_route_non_english_locale.txt
+- spec/fixtures/unit/netmask/net_route_net_tools_1.60.txt
+- spec/fixtures/unit/netmask/ifconfig_darwin_10_8_5.txt
 - spec/fixtures/unit/selinux/selinux_sestatus2
 - spec/fixtures/unit/selinux/selinux_sestatus
 - spec/fixtures/unit/filesystems/linux
@@ -298,8 +303,12 @@ files:
 - spec/fixtures/unit/ec2/rest/meta-data/root
 - spec/fixtures/unit/ipaddress/ifconfig_ubuntu_1204.txt
 - spec/fixtures/unit/ipaddress/ifconfig_net_tools_1.60.txt
+- spec/fixtures/unit/ipaddress/net_route_ubuntu_1204.txt
+- spec/fixtures/unit/ipaddress/net_route_multiple_127_addresses.txt
 - spec/fixtures/unit/ipaddress/ifconfig_non_english_locale.txt
+- spec/fixtures/unit/ipaddress/net_route_non_english_locale.txt
 - spec/fixtures/unit/ipaddress/ifconfig_multiple_127_addresses.txt
+- spec/fixtures/unit/ipaddress/net_route_net_tools_1.60.txt
 - spec/fixtures/unit/processors/os/darwin-system-profiler
 - spec/fixtures/unit/zfs_version/zfs_new
 - spec/fixtures/unit/zfs_version/solaris_11
@@ -344,6 +353,7 @@ files:
 - spec/fixtures/unit/zpool_version/freebsd_8.2
 - spec/fixtures/unit/zpool_version/solaris_10
 - spec/fixtures/ifconfig/open_solaris_b132
+- spec/fixtures/ifconfig/net_route_all_with_multiple_interfaces
 - spec/fixtures/ifconfig/ifconfig_ubuntu_1204.txt
 - spec/fixtures/ifconfig/freebsd_6_0
 - spec/fixtures/ifconfig/linux_ifconfig_venet
@@ -367,6 +377,7 @@ files:
 - spec/fixtures/ifconfig/darwin_10_3_0_en0
 - spec/fixtures/ifconfig/darwin_ifconfig_all_with_multiple_interfaces
 - spec/fixtures/ifconfig/open_solaris_10
+- spec/fixtures/ifconfig/net_route_net_tools_1.60.txt
 - spec/fixtures/ifconfig/darwin_10_6_6_dualstack_en1
 - spec/fixtures/ifconfig/darwin_10_6_6_dualstack
 - spec/fixtures/ifconfig/ubuntu_7_04_eth0
@@ -549,6 +560,7 @@ test_files:
 - spec/fixtures/cpuinfo/two_multicore-grep
 - spec/fixtures/virtual/proc_1_cgroup/in_a_container
 - spec/fixtures/virtual/proc_1_cgroup/not_in_a_container
+- spec/fixtures/virtual/proc_1_cgroup/in_a_docker_container_with_systemd_slices
 - spec/fixtures/virtual/proc_1_cgroup/in_a_docker_container
 - spec/fixtures/virtual/proc_self_status/vserver_2_1/guest
 - spec/fixtures/virtual/proc_self_status/vserver_2_1/host
@@ -567,8 +579,12 @@ test_files:
 - spec/fixtures/processorcount/solaris-psrinfo
 - spec/fixtures/unit/netmask/ifconfig_ubuntu_1204.txt
 - spec/fixtures/unit/netmask/ifconfig_net_tools_1.60.txt
+- spec/fixtures/unit/netmask/net_route_ubuntu_1204.txt
+- spec/fixtures/unit/netmask/net_route_multiple_127_addresses.txt
 - spec/fixtures/unit/netmask/ifconfig_aix_7.txt
-- spec/fixtures/unit/netmask/darwin_10_8_5.txt
+- spec/fixtures/unit/netmask/net_route_non_english_locale.txt
+- spec/fixtures/unit/netmask/net_route_net_tools_1.60.txt
+- spec/fixtures/unit/netmask/ifconfig_darwin_10_8_5.txt
 - spec/fixtures/unit/selinux/selinux_sestatus2
 - spec/fixtures/unit/selinux/selinux_sestatus
 - spec/fixtures/unit/filesystems/linux
@@ -646,8 +662,12 @@ test_files:
 - spec/fixtures/unit/ec2/rest/meta-data/root
 - spec/fixtures/unit/ipaddress/ifconfig_ubuntu_1204.txt
 - spec/fixtures/unit/ipaddress/ifconfig_net_tools_1.60.txt
+- spec/fixtures/unit/ipaddress/net_route_ubuntu_1204.txt
+- spec/fixtures/unit/ipaddress/net_route_multiple_127_addresses.txt
 - spec/fixtures/unit/ipaddress/ifconfig_non_english_locale.txt
+- spec/fixtures/unit/ipaddress/net_route_non_english_locale.txt
 - spec/fixtures/unit/ipaddress/ifconfig_multiple_127_addresses.txt
+- spec/fixtures/unit/ipaddress/net_route_net_tools_1.60.txt
 - spec/fixtures/unit/processors/os/darwin-system-profiler
 - spec/fixtures/unit/zfs_version/zfs_new
 - spec/fixtures/unit/zfs_version/solaris_11
@@ -692,6 +712,7 @@ test_files:
 - spec/fixtures/unit/zpool_version/freebsd_8.2
 - spec/fixtures/unit/zpool_version/solaris_10
 - spec/fixtures/ifconfig/open_solaris_b132
+- spec/fixtures/ifconfig/net_route_all_with_multiple_interfaces
 - spec/fixtures/ifconfig/ifconfig_ubuntu_1204.txt
 - spec/fixtures/ifconfig/freebsd_6_0
 - spec/fixtures/ifconfig/linux_ifconfig_venet
@@ -715,6 +736,7 @@ test_files:
 - spec/fixtures/ifconfig/darwin_10_3_0_en0
 - spec/fixtures/ifconfig/darwin_ifconfig_all_with_multiple_interfaces
 - spec/fixtures/ifconfig/open_solaris_10
+- spec/fixtures/ifconfig/net_route_net_tools_1.60.txt
 - spec/fixtures/ifconfig/darwin_10_6_6_dualstack_en1
 - spec/fixtures/ifconfig/darwin_10_6_6_dualstack
 - spec/fixtures/ifconfig/ubuntu_7_04_eth0