ohai 15.2.5 → 15.3.1

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

@@ -20,7 +20,8 @@ require "spec_helper"
 
 describe Ohai::System, "Linux lspci plugin" do
   let(:plugin) { get_plugin("linux/lspci") }
-  before(:each) do
+
+  before do
     allow(plugin).to receive(:collect_os).and_return(:linux)
     @stdout = <<~LSPCI
       Device:	00:1f.3

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

@@ -21,11 +21,11 @@ require "spec_helper"
 describe Ohai::System, "Machine id plugin" do
   let(:plugin) { get_plugin("linux/machineid") }
 
-  before(:each) do
+  before do
     allow(plugin).to receive(:collect_os).and_return(:linux)
   end
 
-  it "should read /etc/machine-id if available" do
+  it "reads /etc/machine-id if available" do
     machine_id = "6f702523e2fc7499eb1dc68e5314dacf"
 
     allow(::File).to receive(:exist?).with("/etc/machine-id").and_return(true)
@@ -34,7 +34,7 @@ describe Ohai::System, "Machine id plugin" do
     expect(plugin[:machine_id]).to eq(machine_id)
   end
 
-  it "should read /var/lib/dbus/machine-id if available" do
+  it "reads /var/lib/dbus/machine-id if available" do
     machine_id = "6f702523e2fc7499eb1dc68e5314dacf"
 
     allow(::File).to receive(:exist?).with("/etc/machine-id").and_return(false)

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

@@ -19,7 +19,7 @@
 require "spec_helper"
 
 describe Ohai::System, "Linux Mdadm Plugin" do
-  before(:each) do
+  before do
     @md0 = <<~MD
       /dev/md0:
               Version : 1.2
@@ -67,46 +67,46 @@ describe Ohai::System, "Linux Mdadm Plugin" do
 
   describe "gathering Mdadm information via /proc/mdstat and mdadm" do
 
-    it "should not raise an error" do
+    it "does not raise an error" do
       expect { @plugin.run }.not_to raise_error
     end
 
-    it "should detect raid level" do
+    it "detects raid level" do
       @plugin.run
       expect(@plugin[:mdadm][:md0][:level]).to eq(10)
     end
 
-    it "should detect raid state" do
+    it "detects raid state" do
       @plugin.run
       expect(@plugin[:mdadm][:md0][:state]).to eq("clean")
     end
 
-    it "should detect raid size" do
+    it "detects raid size" do
       @plugin.run
       expect(@plugin[:mdadm][:md0][:size]).to eq(2794.16)
     end
 
-    it "should detect raid metadata level" do
+    it "detects raid metadata level" do
       @plugin.run
       expect(@plugin[:mdadm][:md0][:version]).to eq(1.2)
     end
 
     device_counts = { raid: 6, total: 6, active: 6, working: 6, failed: 0, spare: 0 }
     device_counts.each_pair do |item, expected_value|
-      it "should detect device count of \"#{item}\"" do
+      it "detects device count of \"#{item}\"" do
         @plugin.run
         expect(@plugin[:mdadm][:md0][:device_counts][item]).to eq(expected_value)
       end
     end
 
-    it "should detect member devices" do
+    it "detects 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 there are multi-digit numbers" do
+    it "detects 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]")
@@ -120,7 +120,7 @@ describe Ohai::System, "Linux Mdadm Plugin" do
       )
     end
 
-    it "should detect member devices even if mdstat has extra entries" do
+    it "detects 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]")
@@ -134,7 +134,7 @@ describe Ohai::System, "Linux Mdadm Plugin" do
       )
     end
 
-    it "should accurately report inactive arrays" do
+    it "accuratelies report inactive arrays" do
       new_mdstat = double("/proc/mdstat_inactive")
       allow(new_mdstat).to receive(:each)
         .and_yield("Personalities :")
@@ -145,7 +145,7 @@ describe Ohai::System, "Linux Mdadm Plugin" do
       expect(@plugin[:mdadm][:md0][:spares]).to eq(%w{nvme2n1p3})
     end
 
-    it "should report journal devices" do
+    it "reports journal devices" do
       new_mdstat = double("/proc/mdstat_journal")
       allow(new_mdstat).to receive(:each)
         .and_yield("Personalies : [raid6]")
@@ -156,7 +156,7 @@ describe Ohai::System, "Linux Mdadm Plugin" do
       expect(@plugin[:mdadm][:md0][:journal]).to eq("nvme2n1p3")
     end
 
-    it "should report spare devices" do
+    it "reports spare devices" do
       new_mdstat = double("/proc/mdstat_spare")
       allow(new_mdstat).to receive(:each)
         .and_yield("Personalies : [raid6]")

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

@@ -17,7 +17,7 @@
 require "spec_helper"
 
 describe Ohai::System, "Linux memory plugin" do
-  before(:each) do
+  before do
     @plugin = get_plugin("linux/memory")
     allow(@plugin).to receive(:collect_os).and_return(:linux)
     @double_file = double("/proc/meminfo")
@@ -64,192 +64,192 @@ describe Ohai::System, "Linux memory plugin" do
     allow(File).to receive(:open).with("/proc/meminfo").and_return(@double_file)
   end
 
-  it "should get total memory" do
+  it "gets total memory" do
     @plugin.run
     expect(@plugin[:memory][:total]).to eql("131932120kB")
   end
 
-  it "should get free memory" do
+  it "gets free memory" do
     @plugin.run
     expect(@plugin[:memory][:free]).to eql("2269032kB")
   end
 
-  it "should get available memory" do
+  it "gets available memory" do
     @plugin.run
     expect(@plugin[:memory][:available]).to eql("9208922kB")
   end
 
-  it "should get memory used for file buffers" do
+  it "gets memory used for file buffers" do
     @plugin.run
     expect(@plugin[:memory][:buffers]).to eql("646368kB")
   end
 
-  it "should get cache memory" do
+  it "gets cache memory" do
     @plugin.run
     expect(@plugin[:memory][:cached]).to eql("32346556kB")
   end
 
-  it "should get active memory" do
+  it "gets active memory" do
     @plugin.run
     expect(@plugin[:memory][:active]).to eql("98595796kB")
   end
 
-  it "should get inactive memory" do
+  it "gets inactive memory" do
     @plugin.run
     expect(@plugin[:memory][:inactive]).to eql("18477320kB")
   end
 
-  it "should get high_total memory" do
+  it "gets high_total memory" do
     @plugin.run
     expect(@plugin[:memory][:high_total]).to eql("0kB")
   end
 
-  it "should get high_free memory" do
+  it "gets high_free memory" do
     @plugin.run
     expect(@plugin[:memory][:high_free]).to eql("0kB")
   end
 
-  it "should get low_total memory" do
+  it "gets low_total memory" do
     @plugin.run
     expect(@plugin[:memory][:low_total]).to eql("131932120kB")
   end
 
-  it "should get low_free memory" do
+  it "gets low_free memory" do
     @plugin.run
     expect(@plugin[:memory][:low_free]).to eql("2269032kB")
   end
 
-  it "should get dirty memory" do
+  it "gets dirty memory" do
     @plugin.run
     expect(@plugin[:memory][:dirty]).to eql("3212kB")
   end
 
-  it "should get writeback memory" do
+  it "gets writeback memory" do
     @plugin.run
     expect(@plugin[:memory][:writeback]).to eql("0kB")
   end
 
-  it "should get anon_pages memory" do
+  it "gets anon_pages memory" do
     @plugin.run
     expect(@plugin[:memory][:anon_pages]).to eql("84082132kB")
   end
 
-  it "should get mapped memory" do
+  it "gets mapped memory" do
     @plugin.run
     expect(@plugin[:memory][:mapped]).to eql("3445224kB")
   end
 
-  it "should get slab memory" do
+  it "gets slab memory" do
     @plugin.run
     expect(@plugin[:memory][:slab]).to eql("9892096kB")
   end
 
-  it "should get slab_reclaimable memory" do
+  it "gets slab_reclaimable memory" do
     @plugin.run
     expect(@plugin[:memory][:slab_reclaimable]).to eql("362636kB")
   end
 
-  it "should get slab_reclaimable memory" do
+  it "gets slab_reclaimable memory" do
     @plugin.run
     expect(@plugin[:memory][:slab_unreclaim]).to eql("18860kB")
   end
 
-  it "should get page_tables memory" do
+  it "gets page_tables memory" do
     @plugin.run
     expect(@plugin[:memory][:page_tables]).to eql("1759332kB")
   end
 
-  it "should get nfs_unstable memory" do
+  it "gets nfs_unstable memory" do
     @plugin.run
     expect(@plugin[:memory][:nfs_unstable]).to eql("0kB")
   end
 
-  it "should get bounce memory" do
+  it "gets bounce memory" do
     @plugin.run
     expect(@plugin[:memory][:bounce]).to eql("0kB")
   end
 
-  it "should get commit_limit memory" do
+  it "gets commit_limit memory" do
     @plugin.run
     expect(@plugin[:memory][:commit_limit]).to eql("148709328kB")
   end
 
-  it "should get committed_as memory" do
+  it "gets committed_as memory" do
     @plugin.run
     expect(@plugin[:memory][:committed_as]).to eql("333717060kB")
   end
 
-  it "should get vmalloc_total memory" do
+  it "gets vmalloc_total memory" do
     @plugin.run
     expect(@plugin[:memory][:vmalloc_total]).to eql("34359738367kB")
   end
 
-  it "should get vmalloc_used memory" do
+  it "gets vmalloc_used memory" do
     @plugin.run
     expect(@plugin[:memory][:vmalloc_used]).to eql("276796kB")
   end
 
-  it "should get vmalloc_chunk memory" do
+  it "gets vmalloc_chunk memory" do
     @plugin.run
     expect(@plugin[:memory][:vmalloc_chunk]).to eql("34359461515kB")
   end
 
-  it "should get total swap" do
+  it "gets total swap" do
     @plugin.run
     expect(@plugin[:memory][:swap][:total]).to eql("16777208kB")
   end
 
-  it "should get cached swap" do
+  it "gets cached swap" do
     @plugin.run
     expect(@plugin[:memory][:swap][:cached]).to eql("312kB")
   end
 
-  it "should get free swap" do
+  it "gets free swap" do
     @plugin.run
     expect(@plugin[:memory][:swap][:free]).to eql("14127356kB")
   end
 
-  it "should get total hugepages" do
+  it "gets total hugepages" do
     @plugin.run
     expect(@plugin[:memory][:hugepages][:total]).to eql("11542")
   end
 
-  it "should get free hugepages" do
+  it "gets free hugepages" do
     @plugin.run
     expect(@plugin[:memory][:hugepages][:free]).to eql("11235")
   end
 
-  it "should get reserved hugepages" do
+  it "gets reserved hugepages" do
     @plugin.run
     expect(@plugin[:memory][:hugepages][:reserved]).to eql("11226")
   end
 
-  it "should get surplus hugepages" do
+  it "gets surplus hugepages" do
     @plugin.run
     expect(@plugin[:memory][:hugepages][:surplus]).to eql("0")
   end
 
-  it "should get hugepage size" do
+  it "gets hugepage size" do
     @plugin.run
     expect(@plugin[:memory][:hugepage_size]).to eql("2048kB")
   end
 
-  it "should get hugetlb memory" do
+  it "gets hugetlb memory" do
     @plugin.run
     expect(@plugin[:memory][:hugetlb]).to eql("0kB")
   end
 
-  it "should get directmap 4k memory" do
+  it "gets directmap 4k memory" do
     @plugin.run
     expect(@plugin[:memory][:directmap][:'4k']).to eql("3720736kB")
   end
 
-  it "should get directmap 2M memory" do
+  it "gets directmap 2M memory" do
     @plugin.run
     expect(@plugin[:memory][:directmap][:'2M']).to eql("12795904kB")
   end
 
-  it "should get directmap 1G memory" do
+  it "gets directmap 1G memory" do
     @plugin.run
     expect(@plugin[:memory][:directmap][:'1G']).to eql("0kB")
   end

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

@@ -371,7 +371,7 @@ describe Ohai::System, "Linux Network Plugin" do
     EOM
   end
 
-  before(:each) do
+  before do
     allow(plugin).to receive(:collect_os).and_return(:linux)
 
     allow(plugin).to receive(:shell_out).with("ip addr").and_return(mock_shell_out(0, linux_ip_addr, ""))
@@ -545,7 +545,7 @@ describe Ohai::System, "Linux Network Plugin" do
 
   %w{ifconfig iproute2}.each do |network_method|
     describe "gathering IP layer address info via #{network_method}" do
-      before(:each) do
+      before do
         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
@@ -688,7 +688,7 @@ describe Ohai::System, "Linux Network Plugin" do
     end
 
     describe "gathering interface counters via #{network_method}" do
-      before(:each) do
+      before do
         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
@@ -727,7 +727,7 @@ describe Ohai::System, "Linux Network Plugin" do
     end
 
     describe "setting the node's default IP address attribute with #{network_method}" do
-      before(:each) do
+      before do
         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
@@ -760,7 +760,7 @@ describe Ohai::System, "Linux Network Plugin" do
           EOM
         end
 
-        before(:each) do
+        before do
           plugin.run
         end
 
@@ -790,7 +790,7 @@ describe Ohai::System, "Linux Network Plugin" do
           EOM
         end
 
-        before(:each) do
+        before do
           plugin.run
         end
 
@@ -806,7 +806,7 @@ describe Ohai::System, "Linux Network Plugin" do
   end
 
   describe "for newer network features using iproute2 only" do
-    before(:each) do
+    before do
       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
@@ -860,7 +860,7 @@ describe Ohai::System, "Linux Network Plugin" do
     end
 
     describe "when IPv6 is disabled" do
-      before :each do
+      before do
         allow(File).to receive(:exist?).with("/proc/net/if_inet6").and_return(false)
         plugin.run
       end
@@ -891,7 +891,7 @@ describe Ohai::System, "Linux Network Plugin" do
           EOM
         end
 
-        before(:each) do
+        before do
           plugin.run
         end
 
@@ -929,7 +929,7 @@ describe Ohai::System, "Linux Network Plugin" do
           EOM
         end
 
-        before(:each) do
+        before do
           plugin.run
         end
 
@@ -970,7 +970,7 @@ describe Ohai::System, "Linux Network Plugin" do
           EOM
         end
 
-        before(:each) do
+        before do
           plugin.run
         end
 
@@ -1013,7 +1013,7 @@ describe Ohai::System, "Linux Network Plugin" do
           EOM
         end
 
-        before(:each) do
+        before do
           plugin.run
         end
 
@@ -1114,7 +1114,7 @@ describe Ohai::System, "Linux Network Plugin" do
           EOM
         end
 
-        before(:each) do
+        before do
           plugin.run
         end
 
@@ -1135,7 +1135,7 @@ describe Ohai::System, "Linux Network Plugin" do
           EOM
         end
 
-        before(:each) do
+        before do
           plugin.run
         end
 
@@ -1160,7 +1160,7 @@ describe Ohai::System, "Linux Network Plugin" do
           EOM
         end
 
-        before(:each) do
+        before do
           plugin.run
         end
 
@@ -1185,7 +1185,8 @@ describe Ohai::System, "Linux Network Plugin" do
             default via fe80::21c:eff:fe12:3456 dev eth0.153  src fe80::2e0:81ff:fe2b:48e7  metric 1024
           EOM
         end
-        before(:each) do
+
+        before do
           plugin.run
         end
 
@@ -1219,7 +1220,7 @@ describe Ohai::System, "Linux Network Plugin" do
           EOM
         end
 
-        before(:each) do
+        before do
           plugin.run
         end
 
@@ -1258,7 +1259,7 @@ describe Ohai::System, "Linux Network Plugin" do
         let(:linux_ip_route_inet6) { "" }
         let(:linux_ip_inet6_neighbor_show) { "" }
 
-        before(:each) do
+        before do
           allow(plugin).to receive(:is_openvz?).and_return true
           allow(plugin).to receive(:is_openvz_host?).and_return false
           plugin.run
@@ -1303,7 +1304,7 @@ describe Ohai::System, "Linux Network Plugin" do
           EOM
         end
 
-        before(:each) do
+        before do
           plugin.run
         end