ohai 13.1.0 → 13.2.0

data/spec/unit/plugins/darwin/hardware_spec.rb

@@ -31,21 +31,9 @@ describe Ohai::System, "Darwin hardware plugin", :unix_only do
     )
 
     allow(plugin).to receive(:shell_out).with(
-      "sw_vers -productName"
+      "sw_vers"
     ).and_return(
-      mock_shell_out(0, "Mac OS X", "")
-    )
-
-    allow(plugin).to receive(:shell_out).with(
-      "sw_vers -productVersion"
-    ).and_return(
-      mock_shell_out(0, "10.12", "")
-    )
-
-    allow(plugin).to receive(:shell_out).with(
-      "sw_vers -buildVersion"
-    ).and_return(
-      mock_shell_out(0, "16A239j", "")
+      mock_shell_out(0, "ProductName:	Mac OS X\nProductVersion:	10.12\nBuildVersion:	16A239j", "")
     )
 
     allow(plugin).to receive(:shell_out).with(

data/spec/unit/plugins/linux/cpu_spec.rb

@@ -60,6 +60,22 @@ shared_examples "S390 processor info" do |cpu_no, version, identification, machi
   end
 end
 
+shared_examples "arm64 processor info" do |cpu_no, bogomips, features|
+  describe "arm64 processor" do
+    it "has bogomips for cpu #{cpu_no}" do
+      plugin.run
+      expect(plugin[:cpu]["#{cpu_no}"]).to have_key("bogomips")
+      expect(plugin[:cpu]["#{cpu_no}"]["bogomips"]).to eql(bogomips)
+    end
+
+    it "has features for cpu #{cpu_no}" do
+      plugin.run
+      expect(plugin[:cpu]["#{cpu_no}"]).to have_key("features")
+      expect(plugin[:cpu]["#{cpu_no}"]["features"]).to eql(features)
+    end
+  end
+end
+
 describe Ohai::System, "General Linux cpu plugin" do
   let(:plugin) { get_plugin("linux/cpu") }
 
@@ -355,3 +371,34 @@ describe Ohai::System, "S390 linux cpu plugin" do
   it_behaves_like "S390 processor info", 0, "EE", "06E276", "2717"
   it_behaves_like "S390 processor info", 1, "FF", "06E278", "2818"
 end
+
+describe Ohai::System, "arm64 linux cpu plugin" do
+  let(:plugin) { get_plugin("linux/cpu") }
+
+  before(:each) do
+    allow(plugin).to receive(:collect_os).and_return(:linux)
+
+    @double_file = double("/proc/cpuinfo")
+    allow(@double_file).to receive(:each).
+      and_yield("processor	: 0").
+      and_yield("BogoMIPS	: 40.00").
+      and_yield("Features	: fp asimd evtstrm aes pmull sha1 sha2 crc32").
+      and_yield("").
+      and_yield("processor      : 1").
+      and_yield("BogoMIPS       : 40.00").
+      and_yield("Features       : fp asimd evtstrm aes pmull sha1 sha2 crc32").
+      and_yield("")
+    allow(File).to receive(:open).with("/proc/cpuinfo").and_return(@double_file)
+  end
+
+  it_behaves_like "Common cpu info", 2, 0
+
+  it "has a cpu 1" do
+    plugin.run
+    expect(plugin[:cpu]).to have_key("1")
+  end
+
+  features = %w{fp asimd evtstrm aes pmull sha1 sha2 crc32}
+  it_behaves_like "arm64 processor info", 0, "40.00", features
+  it_behaves_like "arm64 processor info", 1, "40.00", features
+end

data/spec/unit/plugins/linux/filesystem_spec.rb

@@ -26,8 +26,9 @@ describe Ohai::System, "Linux filesystem plugin" do
     allow(plugin).to receive(:shell_out).with("df -P").and_return(mock_shell_out(0, "", ""))
     allow(plugin).to receive(:shell_out).with("df -iP").and_return(mock_shell_out(0, "", ""))
     allow(plugin).to receive(:shell_out).with("mount").and_return(mock_shell_out(0, "", ""))
-    allow(File).to receive(:exist?).with("/bin/lsblk").and_return(false)
-    allow(plugin).to receive(:shell_out).with("blkid").and_return(mock_shell_out(0, "", ""))
+    allow(plugin).to receive(:which).with("lsblk").and_return(nil)
+    allow(plugin).to receive(:which).with("blkid").and_return("/sbin/blkid")
+    allow(plugin).to receive(:shell_out).with("/sbin/blkid").and_return(mock_shell_out(0, "", ""))
 
     allow(plugin).to receive(:shell_out).
       with("lsblk -n -P -o NAME,UUID,LABEL,FSTYPE").
@@ -218,7 +219,7 @@ DFi
 /dev/mapper/sys.vg-var.lv: LABEL=\"/var\" UUID=\"6b559c35-7847-4ae2-b512-c99012d3f5b3\" TYPE=\"ext4\"
 /dev/mapper/sys.vg-home.lv: LABEL=\"/home\" UUID=\"d6efda02-1b73-453c-8c74-7d8dee78fa5e\" TYPE=\"xfs\"
 BLKID_TYPE
-      allow(plugin).to receive(:shell_out).with("blkid").and_return(mock_shell_out(0, @stdout, ""))
+      allow(plugin).to receive(:shell_out).with("/sbin/blkid").and_return(mock_shell_out(0, @stdout, ""))
     end
 
     it "should run blkid" do
@@ -260,7 +261,8 @@ none            126922      1  126921    1% /run/shm
 DFi
       allow(plugin).to receive(:shell_out).with("df -iP").and_return(mock_shell_out(0, @inode_stdout, ""))
 
-      allow(File).to receive(:exist?).with("/bin/lsblk").and_return(true)
+      allow(plugin).to receive(:which).with("lsblk").and_return("/sbin/lsblk")
+      allow(plugin).to receive(:which).with("blkid").and_return(nil)
       @stdout = <<-BLKID_TYPE
 NAME=\"sdb1\" UUID=\"bd1197e0-6997-1f3a-e27e-7801388308b5\" LABEL=\"fuego:0\" FSTYPE=\"LVM2_member\"
 NAME=\"sdb2\" UUID=\"e36d933e-e5b9-cfe5-6845-1f84d0f7fbfa\" LABEL=\"fuego:1\" FSTYPE=\"LVM2_member\"
@@ -277,7 +279,7 @@ NAME=\"sys.vg-home.lv\" UUID=\"d6efda02-1b73-453c-8c74-7d8dee78fa5e\" LABEL=\"/h
 NAME=\"debian--7-root (dm-0)\" UUID=\"09187faa-3512-4505-81af-7e86d2ccb99a\" LABEL=\"root\" FSTYPE=\"ext4\"
 BLKID_TYPE
       allow(plugin).to receive(:shell_out).
-        with("lsblk -n -P -o NAME,UUID,LABEL,FSTYPE").
+        with("/sbin/lsblk -n -P -o NAME,UUID,LABEL,FSTYPE").
         and_return(mock_shell_out(0, @stdout, ""))
     end
 
@@ -299,6 +301,92 @@ BLKID_TYPE
 
   end
 
+  describe "when gathering filesystem type data from both lsblk and blkid" do
+    before(:each) do
+      @dfstdout = <<-DF
+Filesystem         1024-blocks      Used Available Capacity Mounted on
+/dev/mapper/sys.vg-root.lv   4805760    378716   4182924       9% /
+tmpfs                  2030944         0   2030944       0% /lib/init/rw
+udev                   2025576       228   2025348       1% /dev
+tmpfs                  2030944      2960   2027984       1% /dev/shm
+/dev/mapper/sys.vg-home.lv  97605056  53563252  44041804      55% /home
+/dev/mapper/sys.vg-special.lv  97605057  53563253  44041805      56% /special
+/dev/mapper/sys.vg-tmp.lv   1919048     46588   1774976       3% /tmp
+/dev/mapper/sys.vg-usr.lv  19223252   5479072  12767696      31% /usr
+/dev/mapper/sys.vg-var.lv  19223252   3436556  14810212      19% /var
+/dev/md0                960492     36388    875312       4% /boot
+DF
+      allow(plugin).to receive(:shell_out).with("df -P").and_return(mock_shell_out(0, @dfstdout, ""))
+
+      @inode_stdout = <<-DFi
+Filesystem      Inodes  IUsed   IFree IUse% Mounted on
+/dev/xvda1     1310720 107407 1203313    9% /
+/dev/mapper/sys.vg-special.lv            124865    380  124485    1% /special
+tmpfs           126922    273  126649    1% /run
+none            126922      1  126921    1% /run/lock
+none            126922      1  126921    1% /run/shm
+DFi
+      allow(plugin).to receive(:shell_out).with("df -iP").and_return(mock_shell_out(0, @inode_stdout, ""))
+
+      allow(plugin).to receive(:which).with("lsblk").and_return("/sbin/lsblk")
+      allow(plugin).to receive(:which).with("blkid").and_return("/sbin/blkid")
+      @stdout = <<-BLKID_TYPE
+NAME=\"sdb1\" UUID=\"bd1197e0-6997-1f3a-e27e-7801388308b5\" LABEL=\"fuego:0\" FSTYPE=\"LVM2_member\"
+NAME=\"sdb2\" UUID=\"e36d933e-e5b9-cfe5-6845-1f84d0f7fbfa\" LABEL=\"fuego:1\" FSTYPE=\"LVM2_member\"
+NAME=\"sda1\" UUID=\"bd1197e0-6997-1f3a-e27e-7801388308b5\" LABEL=\"fuego:0\" FSTYPE=\"LVM2_member\"
+NAME=\"sda2\" UUID=\"e36d933e-e5b9-cfe5-6845-1f84d0f7fbfa\" LABEL=\"fuego:1\" FSTYPE=\"LVM2_member\"
+NAME=\"md0\" UUID=\"37b8de8e-0fe3-4b5a-b9b4-dde33e19bb32\" LABEL=\"/boot\" FSTYPE=\"ext3\"
+NAME=\"md1\" UUID=\"YsIe0R-fj1y-LXTd-imla-opKo-OuIe-TBoxSK\" LABEL=\"\" FSTYPE=\"LVM2_member\"
+NAME=\"sys.vg-root.lv\" UUID=\"7742d14b-80a3-4e97-9a32-478be9ea9aea\" LABEL=\"/\"
+NAME=\"sys.vg-swap.lv\" UUID=\"9bc2e515-8ddc-41c3-9f63-4eaebde9ce96\" LABEL=\"\" FSTYPE=\"swap\"
+NAME=\"sys.vg-tmp.lv\" UUID=\"74cf7eb9-428f-479e-9a4a-9943401e81e5\" LABEL=\"/tmp\" FSTYPE=\"ext4\"
+NAME=\"sys.vg-usr.lv\" UUID=\"26ec33c5-d00b-4f88-a550-492def013bbc\" LABEL=\"/usr\"
+NAME=\"sys.vg-var.lv\" UUID=\"6b559c35-7847-4ae2-b512-c99012d3f5b3\" LABEL=\"/var\" FSTYPE=\"ext4\"
+NAME=\"sys.vg-home.lv\" UUID=\"d6efda02-1b73-453c-8c74-7d8dee78fa5e\" LABEL=\"/BADhome\" FSTYPE=\"xfs\"
+NAME=\"debian--7-root (dm-0)\" UUID=\"09187faa-3512-4505-81af-7e86d2ccb99a\" LABEL=\"root\" FSTYPE=\"ext4\"
+BLKID_TYPE
+      allow(plugin).to receive(:shell_out).
+        with("/sbin/lsblk -n -P -o NAME,UUID,LABEL,FSTYPE").
+        and_return(mock_shell_out(0, @stdout, ""))
+      @stdout = <<-BLKID_TYPE
+/dev/sdb1: LABEL=\"fuego:0\" TYPE=\"linux_raid_member\"
+/dev/sdb2: LABEL=\"fuego:1\" TYPE=\"linux_raid_member\"
+/dev/sda1: LABEL=\"fuego:0\" UUID=\"bd1197e0-6997-1f3a-e27e-7801388308b5\" TYPE=\"linux_raid_member\"
+/dev/sda2: LABEL=\"fuego:1\" UUID=\"e36d933e-e5b9-cfe5-6845-1f84d0f7fbfa\" TYPE=\"linux_raid_member\"
+/dev/md0: LABEL=\"/boot\" UUID=\"37b8de8e-0fe3-4b5a-b9b4-dde33e19bb32\" TYPE=\"ext3\"
+/dev/md1: UUID=\"YsIe0R-fj1y-LXTd-imla-opKo-OuIe-TBoxSK\" TYPE=\"LVM2_member\"
+/dev/mapper/sys.vg-root.lv: LABEL=\"/\" UUID=\"7742d14b-80a3-4e97-9a32-478be9ea9aea\" TYPE=\"ext4\"
+/dev/mapper/sys.vg-swap.lv: UUID=\"9bc2e515-8ddc-41c3-9f63-4eaebde9ce96\"  TYPE=\"swap\"
+/dev/mapper/sys.vg-tmp.lv: LABEL=\"/tmp\" UUID=\"74cf7eb9-428f-479e-9a4a-9943401e81e5\" TYPE=\"ext4\"
+/dev/mapper/sys.vg-usr.lv: LABEL=\"/usr\" UUID=\"26ec33c5-d00b-4f88-a550-492def013bbc\" TYPE=\"ext4\"
+/dev/mapper/sys.vg-var.lv: LABEL=\"/var\" UUID=\"6b559c35-7847-4ae2-b512-c99012d3f5b3\" TYPE=\"ext4\"
+/dev/mapper/sys.vg-home.lv: LABEL=\"/home\" UUID=\"d6efda02-1b73-453c-8c74-7d8dee78fa5e\" TYPE=\"xfs\"
+BLKID_TYPE
+      allow(plugin).to receive(:shell_out).with("/sbin/blkid").and_return(mock_shell_out(0, @stdout, ""))
+    end
+
+    it "should fill in missing FS data from lsblk using blkid" do
+      plugin.run
+      pairs = plugin[:filesystem]["by_pair"]
+      expect(pairs["/dev/mapper/sys.vg-root.lv,/"]["fs_type"]).to eq("ext4")
+      expect(pairs["/dev/mapper/sys.vg-usr.lv,/usr"]["fs_type"]).to eq("ext4")
+    end
+
+    it "should fill in missing FS data from blkid using lsblk" do
+      plugin.run
+      pairs = plugin[:filesystem]["by_pair"]
+      expect(pairs["/dev/sdb1,"]["uuid"]).to eq("bd1197e0-6997-1f3a-e27e-7801388308b5")
+      expect(pairs["/dev/sdb2,"]["uuid"]).to eq("e36d933e-e5b9-cfe5-6845-1f84d0f7fbfa")
+    end
+
+    it "should prefer lsblk data to blkid data when they conflict" do
+      plugin.run
+      pairs = plugin[:filesystem]["by_pair"]
+      expect(pairs["/dev/mapper/sys.vg-home.lv,/home"]["label"]).to eq("/home")
+    end
+
+  end
+
   describe "when gathering data from /proc/mounts" do
     before(:each) do
       allow(File).to receive(:exist?).with("/proc/mounts").and_return(true)
@@ -378,13 +466,14 @@ udev            126922      1  126921    1% /dev
 DFi
       allow(plugin).to receive(:shell_out).with("df -iP").and_return(mock_shell_out(0, @inode_stdout, ""))
 
-      allow(File).to receive(:exist?).with("/bin/lsblk").and_return(true)
+      allow(plugin).to receive(:which).with("lsblk").and_return("/sbin/lsblk")
+      allow(plugin).to receive(:which).with("blkid").and_return(nil)
       @stdout = <<-BLKID_TYPE
 NAME=\"/dev/mapper/sys.vg-root.lv\" UUID=\"7742d14b-80a3-4e97-9a32-478be9ea9aea\" LABEL=\"/\" FSTYPE=\"ext4\"
 NAME=\"/dev/mapper/sys.vg-home.lv\" UUID=\"d6efda02-1b73-453c-8c74-7d8dee78fa5e\" LABEL=\"/home\" FSTYPE=\"xfs\"
 BLKID_TYPE
       allow(plugin).to receive(:shell_out).
-        with("lsblk -n -P -o NAME,UUID,LABEL,FSTYPE").
+        with("/sbin/lsblk -n -P -o NAME,UUID,LABEL,FSTYPE").
         and_return(mock_shell_out(0, @stdout, ""))
     end
 
@@ -422,7 +511,8 @@ udev            126922      1  126921    1% /dev
 DFi
       allow(plugin).to receive(:shell_out).with("df -iP").and_return(mock_shell_out(0, @inode_stdout, ""))
 
-      allow(File).to receive(:exist?).with("/bin/lsblk").and_return(true)
+      allow(plugin).to receive(:which).with("lsblk").and_return("/sbin/lsblk")
+      allow(plugin).to receive(:which).with("blkid").and_return(nil)
       @stdout = <<-BLKID_TYPE
 NAME=\"/dev/mapper/sys.vg-root.lv\" UUID=\"7742d14b-80a3-4e97-9a32-478be9ea9aea\" LABEL=\"/\" FSTYPE=\"ext4\"
 NAME=\"/dev/sdb1\" UUID=\"6b559c35-7847-4ae2-b512-c99012d3f5b3\" LABEL=\"/mnt\" FSTYPE=\"ext4\"
@@ -430,7 +520,7 @@ NAME=\"/dev/sdc1\" UUID=\"7f1e51bf-3608-4351-b7cd-379e39cff36a\" LABEL=\"/mnt\"
 NAME=\"/dev/mapper/sys.vg-home.lv\" UUID=\"d6efda02-1b73-453c-8c74-7d8dee78fa5e\" LABEL=\"/home\" FSTYPE=\"xfs\"
 BLKID_TYPE
       allow(plugin).to receive(:shell_out).
-        with("lsblk -n -P -o NAME,UUID,LABEL,FSTYPE").
+        with("/sbin/lsblk -n -P -o NAME,UUID,LABEL,FSTYPE").
         and_return(mock_shell_out(0, @stdout, ""))
     end
 

data/spec/unit/plugins/linux/mdadm_spec.rb

@@ -99,12 +99,37 @@ MD
       end
     end
 
-    it "should detect member devies" do
+    it "should detect member devices" do
       @plugin.run
       expect(@plugin[:mdadm][:md0][:members].sort).to eq(
         %w{sdc sdd sde sdf sdg sdh}
       )
     end
+
+    it "should detect member devices even if mdstat has extra entries" do
+      new_mdstat = double("/proc/mdstat2")
+      allow(new_mdstat).to receive(:each).
+        and_yield("Personalities : [raid1] [raid6] [raid5] [raid4] [linear] [multipath] [raid0] [raid10]").
+        and_yield("md0 : active (somecraphere) <morestuff> raid10 sdh[5] sdg[4] sdf[3] sde[2] sdd[1] sdc[0]").
+        and_yield("      2929893888 blocks super 1.2 256K chunks 2 near-copies [6/6] [UUUUUU]")
+      allow(File).to receive(:open).with("/proc/mdstat").and_return(new_mdstat)
+
+      @plugin.run
+      expect(@plugin[:mdadm][:md0][:members].sort).to eq(
+        %w{sdc sdd sde sdf sdg sdh}
+      )
+    end
+
+    it "should accurately report inactive arrays" do
+      new_mdstat = double("/proc/mdstat_inactive")
+      allow(new_mdstat).to receive(:each).
+        and_yield("Personalities :").
+        and_yield("md0 : inactive nvme2n1p3[2](S)")
+      allow(File).to receive(:open).with("/proc/mdstat").and_return(new_mdstat)
+
+      @plugin.run
+      expect(@plugin[:mdadm][:md0][:members].sort).to eq(%w{nvme2n1p3})
+    end
   end
 
 end

data/spec/unit/plugins/linux/network_spec.rb

@@ -377,26 +377,6 @@ EOM
     allow(plugin).to receive(:shell_out).with(/ethtool [^\-]/).and_return(mock_shell_out(0, linux_ethtool, ""))
   end
 
-  describe "#iproute2_binary_available?" do
-    ["/sbin/ip", "/usr/bin/ip", "/bin/ip"].each do |path|
-      it "accepts #{path}" do
-        allow(File).to receive(:exist?).and_return(false)
-        allow(File).to receive(:exist?).with(path).and_return(true)
-        expect(plugin.iproute2_binary_available?).to be_truthy
-      end
-    end
-  end
-
-  describe "#find_ethtool_binary" do
-    ["/sbin/ethtool", "/usr/sbin/ethtool"].each do |path|
-      it "accepts #{path}" do
-        allow(File).to receive(:exist?).and_return(false)
-        allow(File).to receive(:exist?).with(path).and_return(true)
-        expect(plugin.find_ethtool_binary).to end_with("/ethtool")
-      end
-    end
-  end
-
   describe "#interface_has_no_addresses_in_family?" do
     context "when interface has no addresses" do
       let(:iface) { {} }
@@ -555,8 +535,8 @@ EOM
   %w{ifconfig iproute2}.each do |network_method|
     describe "gathering IP layer address info via #{network_method}" do
       before(:each) do
-        allow(plugin).to receive(:iproute2_binary_available?).and_return( network_method == "iproute2" )
-        allow(plugin).to receive(:find_ethtool_binary).and_return( "/sbin/ethtool" )
+        allow(plugin).to receive(:which).with("ip").and_return( network_method == "iproute2" ? "/sbin/ip" : false )
+        allow(plugin).to receive(:which).with("ethtool").and_return( "/sbin/ethtool" )
         plugin.run
       end
 
@@ -674,7 +654,8 @@ EOM
 
     describe "gathering interface counters via #{network_method}" do
       before(:each) do
-        allow(plugin).to receive(:iproute2_binary_available?).and_return( network_method == "iproute2" )
+        allow(plugin).to receive(:which).with("ip").and_return(network_method == "iproute2" ? "/sbin/ip" : false)
+        allow(plugin).to receive(:which).with("ethtool").and_return("/sbin/ethtool")
         plugin.run
       end
 
@@ -712,7 +693,8 @@ EOM
 
     describe "setting the node's default IP address attribute with #{network_method}" do
       before(:each) do
-        allow(plugin).to receive(:iproute2_binary_available?).and_return( network_method == "iproute2" )
+        allow(plugin).to receive(:which).with("ip").and_return(network_method == "iproute2" ? "/sbin/ip" : false)
+        allow(plugin).to receive(:which).with("ethtool").and_return("/sbin/ethtool")
         plugin.run
       end
 
@@ -790,9 +772,9 @@ EOM
 
   describe "for newer network features using iproute2 only" do
     before(:each) do
-      allow(File).to receive(:exist?).with("/sbin/ip").and_return(true) # iproute2 only
+      allow(plugin).to receive(:which).with("ip").and_return("/sbin/ip")
+      allow(plugin).to receive(:which).with("ethtool").and_return( "/sbin/ethtool" )
       allow(File).to receive(:exist?).with("/proc/net/if_inet6").and_return(true) # ipv6 is enabled
-      allow(File).to receive(:exist?).with("/sbin/ethtool").and_return(true) # ethtool is available
       plugin.run
     end
 

data/spec/unit/plugins/linux/platform_spec.rb

@@ -35,6 +35,7 @@ describe Ohai::System, "Linux plugin platform" do
   let(:have_parallels_release) { false }
   let(:have_raspi_config) { false }
   let(:have_os_release) { false }
+  let(:have_usr_lib_os_release) { false }
   let(:have_cisco_release) { false }
   let(:have_cumulus_dir) { false }
 
@@ -57,6 +58,7 @@ describe Ohai::System, "Linux plugin platform" do
     allow(File).to receive(:exist?).with("/etc/parallels-release").and_return(have_parallels_release)
     allow(File).to receive(:exist?).with("/usr/bin/raspi-config").and_return(have_raspi_config)
     allow(File).to receive(:exist?).with("/etc/os-release").and_return(have_os_release)
+    allow(File).to receive(:exist?).with("/usr/lib/os-release").and_return(have_usr_lib_os_release)
     allow(File).to receive(:exist?).with("/etc/shared/os-release").and_return(have_cisco_release)
     allow(Dir).to receive(:exist?).with("/etc/cumulus").and_return(have_cumulus_dir)
 
@@ -429,6 +431,14 @@ OS_RELEASE
         expect(@plugin[:platform_version].to_i).to eq(13)
       end
 
+      it "should read the platform as clearos and version as 7.3" do
+        expect(File).to receive(:read).with("/etc/redhat-release").and_return("ClearOS release 7.3.0 (Final)")
+        @plugin.run
+        expect(@plugin[:platform]).to eq("clearos")
+        expect(@plugin[:platform_family]).to eq("rhel")
+        expect(@plugin[:platform_version].to_f).to eq(7.3)
+      end
+
       # https://github.com/chef/ohai/issues/560
       # Issue is seen on EL7, so that's what we're testing.
       context "on versions that have /etc/os-release" do
@@ -853,4 +863,35 @@ CISCO_RELEASE
       expect(@plugin[:platform_version]).to eq("6.0.0.14I")
     end
   end
+
+  describe "on clearlinux" do
+    let(:have_usr_lib_os_release) { true }
+    let(:usr_lib_os_release_content) do
+      <<-CLEARLINUX_RELEASE
+NAME="Clear Linux Software for Intel Architecture"
+VERSION=1
+ID=clear-linux-os
+VERSION_ID=16140
+PRETTY_NAME="Clear Linux OS for Intel Architecture"
+ANSI_COLOR="1;35"
+HOME_URL="https://clearlinux.org"
+SUPPORT_URL="https://clearlinux.org"
+BUG_REPORT_URL="mailto:dev@lists.clearlinux.org"
+PRIVACY_POLICY_URL="http://www.intel.com/privacy"
+CLEARLINUX_RELEASE
+    end
+
+    before do
+      expect(File).to receive(:read).with("/usr/lib/os-release").and_return(usr_lib_os_release_content)
+    end
+
+    it "should set platform to clearlinux and platform_family to clearlinux" do
+      @plugin.lsb = nil
+      @plugin.run
+
+      expect(@plugin[:platform]).to eq("clearlinux")
+      expect(@plugin[:platform_family]).to eq("clearlinux")
+      expect(@plugin[:platform_version]).to eq("16140")
+    end
+  end
 end

data/spec/unit/plugins/linux/systemd_paths_spec.rb

@@ -0,0 +1,122 @@
+#
+# Author:: Davide Cavalca <dcavalca@fb.com>
+# Copyright:: Copyright (c) 2017 Facebook
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS"BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+
+describe Ohai::System, "Linux systemd paths plugin" do
+  let(:plugin) { get_plugin("linux/systemd_paths") }
+
+  before(:each) do
+    allow(plugin).to receive(:collect_os).and_return(:linux)
+  end
+
+  it "should populate systemd_paths if systemd-path is found" do
+    systemd_path_out = <<-SYSTEMD_PATH_OUT
+temporary: /tmp
+temporary-large: /var/tmp
+system-binaries: /usr/bin
+system-include: /usr/include
+system-library-private: /usr/lib
+system-library-arch: /usr/lib/x86_64-linux-gnu
+system-shared: /usr/share
+system-configuration-factory: /usr/share/factory/etc
+system-state-factory: /usr/share/factory/var
+system-configuration: /etc
+system-runtime: /run
+system-runtime-logs: /run/log
+system-state-private: /var/lib
+system-state-logs: /var/log
+system-state-cache: /var/cache
+system-state-spool: /var/spool
+user-binaries: /home/foo/.local/bin
+user-library-private: /home/foo/.local/lib
+user-library-arch: /home/foo/.local/lib/x86_64-linux-gnu
+user-shared: /home/foo/.local/share
+user-configuration: /home/foo/.config
+user-runtime: /run/user/1000
+user-state-cache: /home/foo/.cache
+user: /home/foo
+user-documents: /home/foo/Documents
+user-music: /home/foo/Music
+user-pictures: /home/foo/Pictures
+user-videos: /home/foo/Videos
+user-download: /home/foo/Downloads
+user-public: /home/foo/Public
+user-templates: /home/foo/Templates
+user-desktop: /home/foo/Desktop
+search-binaries: /home/foo/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games:/opt/facebook/bin:/home/foo/.rvm/bin:/home/foo/.rvm/bin
+search-library-private: /home/foo/.local/lib:/usr/local/lib:/usr/lib:/lib
+search-library-arch: /home/foo/.local/lib/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnu:/lib/x86_64-linux-gnu
+search-shared: /home/foo/.local/share:/usr/share/gnome:/home/foo/.local/share/flatpak/exports/share:/var/lib/flatpak/exports/share:/usr/local/share:/usr/share
+search-configuration-factory: /usr/local/share/factory/etc:/usr/share/factory/etc
+search-state-factory: /usr/local/share/factory/var:/usr/share/factory/var
+search-configuration: /home/foo/.config:/etc
+SYSTEMD_PATH_OUT
+
+    allow(plugin).to receive(:which).with("systemd-path").and_return("/bin/systemd-path")
+    allow(plugin).to receive(:shell_out).with("/bin/systemd-path").and_return(mock_shell_out(0, systemd_path_out, ""))
+    plugin.run
+    expect(plugin[:systemd_paths].to_hash).to eq({
+      "search-binaries" => "/home/foo/bin",
+      "search-configuration" => "/home/foo/.config",
+      "search-configuration-factory" => "/usr/local/share/factory/etc",
+      "search-library-arch" => "/home/foo/.local/lib/x86_64-linux-gnu",
+      "search-library-private" => "/home/foo/.local/lib",
+      "search-shared" => "/home/foo/.local/share",
+      "search-state-factory" => "/usr/local/share/factory/var",
+      "system-binaries" => "/usr/bin",
+      "system-configuration" => "/etc",
+      "system-configuration-factory" => "/usr/share/factory/etc",
+      "system-include" => "/usr/include",
+      "system-library-arch" => "/usr/lib/x86_64-linux-gnu",
+      "system-library-private" => "/usr/lib",
+      "system-runtime" => "/run",
+      "system-runtime-logs" => "/run/log",
+      "system-shared" => "/usr/share",
+      "system-state-cache" => "/var/cache",
+      "system-state-factory" => "/usr/share/factory/var",
+      "system-state-logs" => "/var/log",
+      "system-state-private" => "/var/lib",
+      "system-state-spool" => "/var/spool",
+      "temporary" => "/tmp",
+      "temporary-large" => "/var/tmp",
+      "user" => "/home/foo",
+      "user-binaries" => "/home/foo/.local/bin",
+      "user-configuration" => "/home/foo/.config",
+      "user-desktop" => "/home/foo/Desktop",
+      "user-documents" => "/home/foo/Documents",
+      "user-download" => "/home/foo/Downloads",
+      "user-library-arch" => "/home/foo/.local/lib/x86_64-linux-gnu",
+      "user-library-private" => "/home/foo/.local/lib",
+      "user-music" => "/home/foo/Music",
+      "user-pictures" => "/home/foo/Pictures",
+      "user-public" => "/home/foo/Public",
+      "user-runtime" => "/run/user/1000",
+      "user-shared" => "/home/foo/.local/share",
+      "user-state-cache" => "/home/foo/.cache",
+      "user-templates" => "/home/foo/Templates",
+      "user-videos" => "/home/foo/Videos",
+    })
+  end
+
+  it "should not populate systemd paths if systemd-path is not found" do
+    allow(plugin).to receive(:which).with("systemd-path").and_return(false)
+    plugin.run
+    expect(plugin[:systemd_paths]).to be(nil)
+  end
+end