ohai 8.26.1 → 13.0.0

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "plugin fips" do
   let(:enabled) { "0" }

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "Linux hostname plugin" do
   before(:each) do

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "Linux hostnamectl plugin" do
   let(:plugin) { get_plugin("linux/hostnamectl") }

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

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "Linux kernel plugin" do
   before(:each) do

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 # We do not alter case for lsb attributes and consume them as provided
 

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "Machine id plugin" do
   let(:plugin) { get_plugin("linux/machineid") }

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

@@ -16,7 +16,7 @@
 #  limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "Linux Mdadm Plugin" do
   before(:each) do
@@ -99,72 +99,6 @@ MD
       end
     end
 
-    it "should detect member devies" 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 there are multi-digit numbers" 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 raid10 sdj[2010] sdi[99] 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 sdi sdj}
-      )
-    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][:spares]).to eq(%w{nvme2n1p3})
-    end
-
-    it "should report journal devices" do
-      new_mdstat = double("/proc/mdstat_journal")
-      allow(new_mdstat).to receive(:each).
-        and_yield("Personalies : [raid6]").
-        and_yield("md0 : active (somecraphere) <morestuff raid6 sdbc1[7] sdd1[6] sde1[5] sdd1[4] sde1[3] sdf1[2] sdg1[1] nvme2n1p3[0](J)")
-      allow(File).to receive(:open).with("/proc/mdstat").and_return(new_mdstat)
-
-      @plugin.run
-      expect(@plugin[:mdadm][:md0][:journal]).to eq("nvme2n1p3")
-    end
-
-    it "should report spare devices" do
-      new_mdstat = double("/proc/mdstat_spare")
-      allow(new_mdstat).to receive(:each).
-        and_yield("Personalies : [raid6]").
-        and_yield("md0 : active (somecraphere) <morestuff raid6 sdbc1[7] sdd1[6] sde1[5] sdd1[4] sde1[3] sdf1[2] sdg1[1] sdh1[0](S)")
-      allow(File).to receive(:open).with("/proc/mdstat").and_return(new_mdstat)
-
-      @plugin.run
-      expect(@plugin[:mdadm][:md0][:spares]).to eq(%w{sdh1})
-    end
   end
+
 end

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

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "Linux memory plugin" do
   before(:each) do

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

@@ -17,14 +17,8 @@
 #  limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
-
-begin
-  require "ipaddress"
-rescue LoadError => e
-  puts "The linux network plugin spec tests will fail without the 'ipaddress' library/gem.\n\n"
-  raise e
-end
+require_relative "../../../spec_helper.rb"
+require "ipaddress"
 
 describe Ohai::System, "Linux Network Plugin" do
   let(:plugin) { get_plugin("linux/network") }
@@ -240,10 +234,6 @@ EOM
        valid_lft forever preferred_lft forever
 13: fwdintf: <MULTICAST,NOARP,UP,LOWER_UP> mtu 1496 qdisc pfifo_fast state UNKNOWN group default qlen 1000
     link/ether 00:00:00:00:00:0a brd ff:ff:ff:ff:ff:ff
-14: ip6tnl0@NONE: <NOARP,UP,LOWER_UP> mtu 1452 qdisc noqueue state UNKNOWN group default qlen 1
-    link/tunnel6 :: brd ::
-    inet6 fe80::f47a:2aff:fef0:c6ef/64 scope link
-       valid_lft forever preferred_lft forever
 EOM
   end
 
@@ -304,13 +294,6 @@ EOM
     0          0        0       0       0       0
     TX: bytes  packets  errors  dropped carrier collsns
     140        2        0       1       0       0
-14: ip6tnl0@NONE: <NOARP> mtu 1452 qdisc noop state DOWN mode DEFAULT group default qlen 1
-    link/tunnel6 :: brd :: promiscuity 0
-    ip6tnl ip6ip6 remote :: local :: encaplimit 0 hoplimit 0 tclass 0x00 flowlabel 0x00000 (flowinfo 0x00000000) addrgenmode eui64 numtxqueues 1 numrxqueues 1 gso_max_size 65536 gso_max_segs 65535
-    RX: bytes  packets  errors  dropped overrun mcast
-    0          0        0       0       0       0
-    TX: bytes  packets  errors  dropped carrier collsns
-    0          0        0       0       0       0
 EOM
   end
 
@@ -583,11 +566,7 @@ EOM
       end
 
       it "detects the interfaces" do
-        if network_method == "iproute2"
-          expect(plugin["network"]["interfaces"].keys.sort).to eq(["eth0", "eth0.11", "eth0.151", "eth0.152", "eth0.153", "eth0:5", "eth3", "foo:veth0@eth0", "fwdintf", "ip6tnl0", "lo", "ovs-system", "tun0", "venet0", "venet0:0", "xapi1"])
-        else
-          expect(plugin["network"]["interfaces"].keys.sort).to eq(["eth0", "eth0.11", "eth0.151", "eth0.152", "eth0.153", "eth0:5", "eth3", "foo:veth0@eth0", "fwdintf", "lo", "ovs-system", "tun0", "venet0", "venet0:0", "xapi1"])
-        end
+        expect(plugin["network"]["interfaces"].keys.sort).to eq(["eth0", "eth0.11", "eth0.151", "eth0.152", "eth0.153", "eth0:5", "eth3", "foo:veth0@eth0", "fwdintf", "lo", "ovs-system", "tun0", "venet0", "venet0:0", "xapi1"])
       end
 
       it "detects the layer one details of an ethernet interface" do
@@ -691,26 +670,6 @@ EOM
         expect(plugin["network"]["interfaces"]["eth0"]["arp"]["10.116.201.1"]).to eq("fe:ff:ff:ff:ff:ff")
       end
 
-      if network_method == "iproute2"
-        it "detects the tunnel information" do
-          expect(plugin["network"]["interfaces"]["ip6tnl0"]["tunnel_info"]).to eq(
-            {
-              "proto" => "ip6ip6",
-              "remote" => "::",
-              "local" => "::",
-              "encaplimit" => "0",
-              "hoplimit" => "0",
-              "tclass" => "0x00",
-              "flowlabel" => "0x00000",
-              "addrgenmode" => "eui64",
-              "numtxqueues" => "1",
-              "numrxqueues" => "1",
-              "gso_max_size" => "65536",
-              "gso_max_segs" => "65535",
-            }
-          )
-        end
-      end
     end
 
     describe "gathering interface counters via #{network_method}" do

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

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) 2008-2017, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "Linux plugin platform" do
 
@@ -113,7 +113,7 @@ describe Ohai::System, "Linux plugin platform" do
       @plugin[:lsb][:release] = "2011.09"
       @plugin.run
       expect(@plugin[:platform]).to eq("amazon")
-      expect(@plugin[:platform_family]).to eq("rhel")
+      expect(@plugin[:platform_family]).to eq("amazon")
     end
 
     it "should set platform to scientific when [:lsb][:id] contains ScientificSL" do
@@ -358,7 +358,7 @@ OS_RELEASE
       it "should set the platform_family to rhel if the LSB name is amazon-ish" do
         @plugin[:lsb][:id] = "Amazon"
         @plugin.run
-        expect(@plugin[:platform_family]).to eq("rhel")
+        expect(@plugin[:platform_family]).to eq("amazon")
       end
 
       it "should set the platform_family to fedora if the LSB name is fedora-ish" do

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "Linux sessions plugin" do
   let(:plugin) { get_plugin("linux/sessions") }

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "Linux plugin uptime" do
   before(:each) do

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "Linux virtualization platform" do
   let(:plugin) { get_plugin("linux/virtualization") }
@@ -43,7 +43,6 @@ describe Ohai::System, "Linux virtualization platform" do
 
     # default the which wrappers to nil
     allow(plugin).to receive(:lxc_version_exists?).and_return(false)
-    allow(plugin).to receive(:docker_exists?).and_return(false)
     allow(plugin).to receive(:nova_exists?).and_return(false)
   end
 
@@ -649,30 +648,6 @@ CGROUP
       expect(plugin[:virtualization][:systems][:docker]).to eq("guest")
     end
 
-    it "sets docker guest if /proc/self/cgroup exist and there are /docker/docker-ce/<hexadecimal> mounts" do
-      self_cgroup = <<-CGROUP
-13:name=systemd:/docker-ce/docker/b15b85d19304436488a78d06afeb108d94b20bb6898d852b65cad51bd7dc9468
-12:pids:/docker-ce/docker/b15b85d19304436488a78d06afeb108d94b20bb6898d852b65cad51bd7dc9468
-11:hugetlb:/docker-ce/docker/b15b85d19304436488a78d06afeb108d94b20bb6898d852b65cad51bd7dc9468
-10:net_prio:/docker-ce/docker/b15b85d19304436488a78d06afeb108d94b20bb6898d852b65cad51bd7dc9468
-9:perf_event:/docker-ce/docker/b15b85d19304436488a78d06afeb108d94b20bb6898d852b65cad51bd7dc9468
-8:net_cls:/docker-ce/docker/b15b85d19304436488a78d06afeb108d94b20bb6898d852b65cad51bd7dc9468
-7:freezer:/docker-ce/docker/b15b85d19304436488a78d06afeb108d94b20bb6898d852b65cad51bd7dc9468
-6:devices:/docker-ce/docker/b15b85d19304436488a78d06afeb108d94b20bb6898d852b65cad51bd7dc9468
-5:memory:/docker-ce/docker/b15b85d19304436488a78d06afeb108d94b20bb6898d852b65cad51bd7dc9468
-4:blkio:/docker-ce/docker/b15b85d19304436488a78d06afeb108d94b20bb6898d852b65cad51bd7dc9468
-3:cpuacct:/docker-ce/docker/b15b85d19304436488a78d06afeb108d94b20bb6898d852b65cad51bd7dc9468
-2:cpu:/docker-ce/docker/b15b85d19304436488a78d06afeb108d94b20bb6898d852b65cad51bd7dc9468
-1:cpuset:/docker-ce/docker/b15b85d19304436488a78d06afeb108d94b20bb6898d852b65cad51bd7dc9468
-CGROUP
-      allow(File).to receive(:exist?).with("/proc/self/cgroup").and_return(true)
-      allow(File).to receive(:read).with("/proc/self/cgroup").and_return(self_cgroup)
-      plugin.run
-      expect(plugin[:virtualization][:system]).to eq("docker")
-      expect(plugin[:virtualization][:role]).to eq("guest")
-      expect(plugin[:virtualization][:systems][:docker]).to eq("guest")
-    end
-
     # Relevant at least starting docker 1.6.2, kernel 4.0.5 & systemd 224-1.
     # Doi not exactly know which software/version really matters here.
     it "should set docker guest if /proc/self/cgroup exists and there are /system.slice/docker-<hexadecimal> mounts (systemd managed cgroup)" do
@@ -732,7 +707,6 @@ CGROUP
     end
 
     it "does not set the old virtualization attributes if they are already set" do
-      allow(plugin).to receive(:docker_exists?).and_return("/usr/bin/docker")
       plugin[:virtualization] = Mash.new
       plugin[:virtualization][:system] = "the cloud"
       plugin[:virtualization][:role] = "cumulonimbus"
@@ -742,7 +716,6 @@ CGROUP
     end
 
     it "does not set docker host if docker does not exist" do
-      allow(plugin).to receive(:docker_exists?).and_return(false)
       plugin.run
       expect(plugin[:virtualization][:system]).to be_nil
       expect(plugin[:virtualization][:role]).to be_nil

data/spec/unit/plugins/lua_spec.rb

@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "/spec_helper.rb"))
+require_relative "../../spec_helper.rb"
 
 describe Ohai::System, "plugin lua" do
 

data/spec/unit/plugins/mono_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "/spec_helper.rb"))
+require_relative "../../spec_helper.rb"
 
 describe Ohai::System, "plugin mono" do
   let(:plugin) { get_plugin("mono") }

data/spec/unit/plugins/netbsd/hostname_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "NetBSD hostname plugin" do
   before(:each) do

data/spec/unit/plugins/netbsd/kernel_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "NetBSD kernel plugin" do
   before(:each) do

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "NetBSD plugin platform" do
   before(:each) do

data/spec/unit/plugins/network_spec.rb

@@ -16,7 +16,7 @@
 #  limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
+require_relative "../../spec_helper.rb"
 
 def it_doesnt_fail
   it "doesnt fail" do

data/spec/unit/plugins/nodejs_spec.rb

@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "/spec_helper.rb"))
+require_relative "../../spec_helper.rb"
 
 describe Ohai::System, "plugin nodejs" do
 

data/spec/unit/plugins/ohai_spec.rb

@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
+require_relative "../../spec_helper.rb"
 
 describe Ohai::System, "plugin ohai" do
   before(:each) do

data/spec/unit/plugins/ohai_time_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
+require_relative "../../spec_helper.rb"
 
 describe Ohai::System, "plugin ohai_time" do
   before(:each) do

data/spec/unit/plugins/openbsd/hostname_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "OpenBSD hostname plugin" do
   before(:each) do