ohai 15.2.5 → 15.3.1

data/spec/unit/plugins/kernel_spec.rb

@@ -19,7 +19,7 @@
 require "spec_helper"
 
 describe Ohai::System, "plugin kernel" do
-  before(:each) do
+  before do
     @plugin = get_plugin("kernel")
     allow(@plugin).to receive(:collect_os).and_return(:default) # for debugging
     allow(@plugin).to receive(:shell_out).with("uname -s").and_return(mock_shell_out(0, "Darwin\n", ""))

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

@@ -41,7 +41,7 @@ describe Ohai::System, "Linux Block Device Plugin" do
     tmp_double
   end
 
-  before(:each) do
+  before do
     @plugin = get_plugin("linux/block_device")
     allow(@plugin).to receive(:collect_os).and_return(:linux)
 
@@ -66,7 +66,7 @@ describe Ohai::System, "Linux Block Device Plugin" do
     end
   end
 
-  it "should collect all relevant data from disks" do
+  it "collects all relevant data from disks" do
     @plugin.run
     DISKS.each do |disk, checks|
       expect(@plugin[:block_device][disk.to_sym]).to include(checks)

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

@@ -86,12 +86,12 @@ describe Ohai::System, "General Linux cpu plugin" do
     tempfile
   end
 
-  before(:each) do
+  before do
     allow(plugin).to receive(:collect_os).and_return(:linux)
     allow(File).to receive(:open).with("/proc/cpuinfo").and_return(tempfile_handle)
   end
 
-  after(:each) do
+  after do
 
     tempfile.close
     tempfile.unlink
@@ -154,15 +154,15 @@ describe Ohai::System, "General Linux cpu plugin" do
       EOF
     end
 
-    it_behaves_like "Common cpu info", 1, 1
-
-    before(:each) do
+    before do
       allow(plugin).to receive(:shell_out).with("lscpu").and_return(mock_shell_out(0, lscpu, ""))
     end
 
+    it_behaves_like "Common cpu info", 1, 1
+
     it "gets total cores" do
       plugin.run
-      expect(plugin[:cpu][:cores]).to eql(1)
+      expect(plugin[:cpu][:cores]).to be(1)
     end
 
     it "doesn't have a cpu 1" do
@@ -233,6 +233,7 @@ describe Ohai::System, "General Linux cpu plugin" do
       expect(plugin[:cpu]["0"]["flags"]).to eq(%w{fpu pse tsc msr mce cx8 sep mtrr pge cmov})
     end
   end
+
   context "with a dual-core hyperthreaded /proc/cpuinfo" do
     let(:cpuinfo_contents) do
       <<~EOF
@@ -363,7 +364,7 @@ end
 describe Ohai::System, "S390 linux cpu plugin" do
   let(:plugin) { get_plugin("cpu") }
 
-  before(:each) do
+  before do
     allow(plugin).to receive(:collect_os).and_return(:linux)
     allow(plugin).to receive(:shell_out).with("lscpu").and_return(mock_shell_out(1, "", ""))
 
@@ -410,7 +411,7 @@ end
 describe Ohai::System, "arm64 linux cpu plugin" do
   let(:plugin) { get_plugin("cpu") }
 
-  before(:each) do
+  before do
     allow(plugin).to receive(:collect_os).and_return(:linux)
     allow(plugin).to receive(:shell_out).with("lscpu").and_return(mock_shell_out(1, "", ""))
 

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

@@ -20,7 +20,8 @@ require "spec_helper"
 
 describe Ohai::System, "Linux filesystem plugin" do
   let(:plugin) { get_plugin("filesystem") }
-  before(:each) do
+
+  before do
     allow(plugin).to receive(:collect_os).and_return(:linux)
 
     allow(plugin).to receive(:shell_out).with("df -P").and_return(mock_shell_out(0, "", ""))
@@ -56,7 +57,7 @@ describe Ohai::System, "Linux filesystem plugin" do
   end
 
   describe "when gathering filesystem usage data from df" do
-    before(:each) do
+    before do
       @stdout = <<~DF
         Filesystem         1024-blocks      Used Available Capacity Mounted on
         /dev/mapper/sys.vg-root.lv   4805760    378716   4182924       9% /
@@ -83,55 +84,55 @@ describe Ohai::System, "Linux filesystem plugin" do
       allow(plugin).to receive(:shell_out).with("df -iP").and_return(mock_shell_out(0, @inode_stdout, ""))
     end
 
-    it "should run df -P and df -iP" do
+    it "runs df -P and df -iP" do
       expect(plugin).to receive(:shell_out).ordered.with("df -P").and_return(mock_shell_out(0, @stdout, ""))
       expect(plugin).to receive(:shell_out).ordered.with("df -iP").and_return(mock_shell_out(0, @inode_stdout, ""))
       plugin.run
     end
 
-    it "should set kb_size to value from df -P" do
+    it "sets kb_size to value from df -P" do
       plugin.run
       expect(plugin[:filesystem]["by_pair"]["/dev/mapper/sys.vg-special.lv,/special"][:kb_size]).to eq("97605057")
     end
 
-    it "should set kb_used to value from df -P" do
+    it "sets kb_used to value from df -P" do
       plugin.run
       expect(plugin[:filesystem]["by_pair"]["/dev/mapper/sys.vg-special.lv,/special"][:kb_used]).to eq("53563253")
     end
 
-    it "should set kb_available to value from df -P" do
+    it "sets kb_available to value from df -P" do
       plugin.run
       expect(plugin[:filesystem]["by_pair"]["/dev/mapper/sys.vg-special.lv,/special"][:kb_available]).to eq("44041805")
     end
 
-    it "should set percent_used to value from df -P" do
+    it "sets percent_used to value from df -P" do
       plugin.run
       expect(plugin[:filesystem]["by_pair"]["/dev/mapper/sys.vg-special.lv,/special"][:percent_used]).to eq("56%")
     end
 
-    it "should set mount to value from df -P" do
+    it "sets mount to value from df -P" do
       plugin.run
       expect(plugin[:filesystem]["by_pair"]["/dev/mapper/sys.vg-special.lv,/special"][:mount]).to eq("/special")
     end
 
-    it "should set total_inodes to value from df -iP" do
+    it "sets total_inodes to value from df -iP" do
       plugin.run
       expect(plugin[:filesystem]["by_pair"]["/dev/mapper/sys.vg-special.lv,/special"][:total_inodes]).to eq("124865")
     end
 
-    it "should set inodes_used to value from df -iP" do
+    it "sets inodes_used to value from df -iP" do
       plugin.run
       expect(plugin[:filesystem]["by_pair"]["/dev/mapper/sys.vg-special.lv,/special"][:inodes_used]).to eq("380")
     end
 
-    it "should set inodes_available to value from df -iP" do
+    it "sets inodes_available to value from df -iP" do
       plugin.run
       expect(plugin[:filesystem]["by_pair"]["/dev/mapper/sys.vg-special.lv,/special"][:inodes_available]).to eq("124485")
     end
   end
 
   describe "when gathering mounted filesystem data from mount" do
-    before(:each) do
+    before do
       @stdout = <<~MOUNT
         /dev/mapper/sys.vg-root.lv on / type ext4 (rw,noatime,errors=remount-ro)
         tmpfs on /lib/init/rw type tmpfs (rw,nosuid,mode=0755)
@@ -152,29 +153,29 @@ describe Ohai::System, "Linux filesystem plugin" do
       allow(plugin).to receive(:shell_out).with("mount").and_return(mock_shell_out(0, @stdout, ""))
     end
 
-    it "should run mount" do
+    it "runs mount" do
       expect(plugin).to receive(:shell_out).with("mount").and_return(mock_shell_out(0, @stdout, ""))
       plugin.run
     end
 
-    it "should set mount to value from mount" do
+    it "sets mount to value from mount" do
       plugin.run
       expect(plugin[:filesystem]["by_pair"]["/dev/mapper/sys.vg-special.lv,/special"][:mount]).to eq("/special")
     end
 
-    it "should set fs_type to value from mount" do
+    it "sets fs_type to value from mount" do
       plugin.run
       expect(plugin[:filesystem]["by_pair"]["/dev/mapper/sys.vg-special.lv,/special"][:fs_type]).to eq("xfs")
     end
 
-    it "should set mount_options to an array of values from mount" do
+    it "sets mount_options to an array of values from mount" do
       plugin.run
       expect(plugin[:filesystem]["by_pair"]["/dev/mapper/sys.vg-special.lv,/special"][:mount_options]).to eq(%w{ro noatime})
     end
   end
 
   describe "when gathering filesystem type data from blkid" do
-    before(:each) do
+    before do
       # blkid and lsblk output are coorelated with df/mount output, so the
       # most full test of them actually requires we have both
       @dfstdout = <<~DF
@@ -219,11 +220,11 @@ describe Ohai::System, "Linux filesystem plugin" do
       allow(plugin).to receive(:shell_out).with("/sbin/blkid", timeout: 60).and_return(mock_shell_out(0, @stdout, ""))
     end
 
-    it "should run blkid" do
+    it "runs blkid" do
       plugin.run
     end
 
-    it "should set kb_size to value from blkid" do
+    it "sets kb_size to value from blkid" do
       plugin.run
       expect(plugin[:filesystem]["by_pair"]["/dev/md1,"][:fs_type]).to eq("LVM2_member")
       expect(plugin[:filesystem]["by_pair"]["/dev/sda2,"][:uuid]).to eq("e36d933e-e5b9-cfe5-6845-1f84d0f7fbfa")
@@ -232,7 +233,7 @@ describe Ohai::System, "Linux filesystem plugin" do
   end
 
   describe "when gathering filesystem type data from lsblk" do
-    before(:each) do
+    before do
       @dfstdout = <<~DF
         Filesystem         1024-blocks      Used Available Capacity Mounted on
         /dev/mapper/sys.vg-root.lv   4805760    378716   4182924       9% /
@@ -280,18 +281,18 @@ describe Ohai::System, "Linux filesystem plugin" do
         .and_return(mock_shell_out(0, @stdout, ""))
     end
 
-    it "should run lsblk -n -P -o NAME,UUID,LABEL,FSTYPE" do
+    it "runs lsblk -n -P -o NAME,UUID,LABEL,FSTYPE" do
       plugin.run
     end
 
-    it "should set kb_size to value from lsblk -n -P -o NAME,UUID,LABEL,FSTYPE" do
+    it "sets kb_size to value from lsblk -n -P -o NAME,UUID,LABEL,FSTYPE" do
       plugin.run
       expect(plugin[:filesystem]["by_pair"]["/dev/md1,"][:fs_type]).to eq("LVM2_member")
       expect(plugin[:filesystem]["by_pair"]["/dev/sda2,"][:uuid]).to eq("e36d933e-e5b9-cfe5-6845-1f84d0f7fbfa")
       expect(plugin[:filesystem]["by_pair"]["/dev/md0,/boot"][:label]).to eq("/boot")
     end
 
-    it "should ignore extra info in name and set label to value from lsblk  -n -P -o NAME,UUID,LABEL,FSTYPE" do
+    it "ignores extra info in name and set label to value from lsblk -n -P -o NAME,UUID,LABEL,FSTYPE" do
       plugin.run
       expect(plugin[:filesystem]["by_pair"]["/dev/mapper/debian--7-root,"][:label]).to eq("root")
     end
@@ -299,7 +300,7 @@ describe Ohai::System, "Linux filesystem plugin" do
   end
 
   describe "when gathering filesystem type data from both lsblk and blkid" do
-    before(:each) do
+    before do
       @dfstdout = <<~DF
         Filesystem         1024-blocks      Used Available Capacity Mounted on
         /dev/mapper/sys.vg-root.lv   4805760    378716   4182924       9% /
@@ -362,21 +363,21 @@ describe Ohai::System, "Linux filesystem plugin" do
       allow(plugin).to receive(:shell_out).with("/sbin/blkid", timeout: 60).and_return(mock_shell_out(0, @stdout, ""))
     end
 
-    it "should fill in missing FS data from lsblk using blkid" do
+    it "fills 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
+    it "fills 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
+    it "prefers 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")
@@ -385,7 +386,7 @@ describe Ohai::System, "Linux filesystem plugin" do
   end
 
   describe "when gathering data from /proc/mounts" do
-    before(:each) do
+    before do
       allow(File).to receive(:exist?).with("/proc/mounts").and_return(true)
       @double_file = double("/proc/mounts")
       @mounts = <<~MOUNTS
@@ -417,24 +418,24 @@ describe Ohai::System, "Linux filesystem plugin" do
       allow(File).to receive(:open).with("/proc/mounts").and_return(@double_file)
     end
 
-    it "should set mount to value from /proc/mounts" do
+    it "sets mount to value from /proc/mounts" do
       plugin.run
       expect(plugin[:filesystem]["by_pair"]["/dev/mapper/sys.vg-special.lv,/special"][:mount]).to eq("/special")
     end
 
-    it "should set fs_type to value from /proc/mounts" do
+    it "sets fs_type to value from /proc/mounts" do
       plugin.run
       expect(plugin[:filesystem]["by_pair"]["/dev/mapper/sys.vg-special.lv,/special"][:fs_type]).to eq("xfs")
     end
 
-    it "should set mount_options to an array of values from /proc/mounts" do
+    it "sets mount_options to an array of values from /proc/mounts" do
       plugin.run
       expect(plugin[:filesystem]["by_pair"]["/dev/mapper/sys.vg-special.lv,/special"][:mount_options]).to eq(%w{ro noatime attr2 noquota})
     end
   end
 
   describe "when gathering filesystem data with devices mounted more than once" do
-    before(:each) do
+    before do
       # there's a few different examples one can run into in this output:
       # 1. A device physically mounted in more than one place: /home and /home2
       # 2. A bind-mounted directory, which shows up as the same device in a
@@ -475,7 +476,7 @@ describe Ohai::System, "Linux filesystem plugin" do
         .and_return(mock_shell_out(0, @stdout, ""))
     end
 
-    it "should provide a devices view with all mountpoints" do
+    it "provides a devices view with all mountpoints" do
       plugin.run
       expect(plugin[:filesystem]["by_device"]["/dev/mapper/sys.vg-root.lv"][:mounts]).to eq(["/", "/var/chroot"])
       expect(plugin[:filesystem]["by_device"]["/dev/mapper/sys.vg-home.lv"][:mounts]).to eq(["/home", "/home2"])
@@ -484,7 +485,7 @@ describe Ohai::System, "Linux filesystem plugin" do
   end
 
   describe "when gathering filesystem data with double-mounts" do
-    before(:each) do
+    before do
       @dfstdout = <<~DF
         Filesystem         1024-blocks      Used Available Capacity Mounted on
         /dev/mapper/sys.vg-root.lv   4805760    378716   4182924       9% /
@@ -522,7 +523,7 @@ describe Ohai::System, "Linux filesystem plugin" do
         .and_return(mock_shell_out(0, @stdout, ""))
     end
 
-    it "should provide a mounts view with all devices" do
+    it "provides a mounts view with all devices" do
       plugin.run
       expect(plugin[:filesystem]["by_mountpoint"]["/mnt"][:devices]).to eq(["/dev/sdb1", "/dev/sdc1"])
     end

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

@@ -20,16 +20,16 @@ require "spec_helper"
 require "openssl"
 
 describe Ohai::System, "plugin fips" do
-  let(:enabled) { "0" }
-  let(:plugin) { get_plugin("linux/fips") }
-  let(:openssl_test_mode) { false }
-
   subject do
     plugin.run
     plugin["fips"]["kernel"]["enabled"]
   end
 
-  before(:each) do
+  let(:enabled) { "0" }
+  let(:plugin) { get_plugin("linux/fips") }
+  let(:openssl_test_mode) { false }
+
+  before do
     allow(plugin).to receive(:collect_os).and_return(:linux)
   end
 
@@ -44,6 +44,7 @@ describe Ohai::System, "plugin fips" do
 
   context "with OpenSSL.fips_mode == false" do
     before { allow(OpenSSL).to receive(:fips_mode).and_return(false) }
+
     it "does not set fips plugin" do
       expect(subject).to be(false)
     end
@@ -51,6 +52,7 @@ describe Ohai::System, "plugin fips" do
 
   context "with OpenSSL.fips_mode == true" do
     before { allow(OpenSSL).to receive(:fips_mode).and_return(true) }
+
     it "sets fips plugin" do
       expect(subject).to be(true)
     end

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

@@ -19,7 +19,7 @@
 require "spec_helper"
 
 describe Ohai::System, "Linux hostname plugin" do
-  before(:each) do
+  before do
     @plugin = get_plugin("hostname")
     allow(@plugin).to receive(:collect_os).and_return(:linux)
     allow(@plugin).to receive(:shell_out).with("hostname -s").and_return(mock_shell_out(0, "katie", ""))
@@ -34,15 +34,15 @@ describe Ohai::System, "Linux hostname plugin" do
   it_should_check_from("linux::hostname", "machinename", "hostname", "katie.local")
 
   describe "when domain name is unset" do
-    before(:each) do
+    before do
       expect(@plugin).to receive(:shell_out).with("hostname --fqdn").and_raise("Ohai::Exception::Exec")
     end
 
-    it "should not raise an error" do
+    it "does not raise an error" do
       expect { @plugin.run }.not_to raise_error
     end
 
-    it "should not set fqdn" do
+    it "does not set fqdn" do
       @plugin.run
       expect(@plugin.fqdn).to eq(nil)
     end

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

@@ -21,11 +21,11 @@ require "spec_helper"
 describe Ohai::System, "Linux hostnamectl plugin" do
   let(:plugin) { get_plugin("linux/hostnamectl") }
 
-  before(:each) do
+  before do
     allow(plugin).to receive(:collect_os).and_return(:linux)
   end
 
-  it "should populate hostnamectl if hostnamectl is available" do
+  it "populates hostnamectl if hostnamectl is available" do
     hostnamectl_out = <<-HOSTNAMECTL_OUT
    Static hostname: foo
          Icon name: computer-laptop
@@ -52,7 +52,7 @@ describe Ohai::System, "Linux hostnamectl plugin" do
     })
   end
 
-  it "should not populate hostnamectl if hostnamectl is not available" do
+  it "does not populate hostnamectl if hostnamectl is not available" do
     allow(plugin).to receive(:which).with("hostnamectl").and_return(false)
     expect(plugin[:hostnamectl]).to eq(nil)
   end

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

@@ -20,7 +20,7 @@
 require "spec_helper"
 
 describe Ohai::System, "Linux kernel plugin" do
-  before(:each) do
+  before do
     @env_lsmod = <<~ENV_LSMOD
       Module                  Size  Used by
       dm_crypt               22321  0

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

@@ -21,13 +21,13 @@ require "spec_helper"
 # We do not alter case for lsb attributes and consume them as provided
 
 describe Ohai::System, "Linux lsb plugin" do
-  before(:each) do
+  before do
     @plugin = get_plugin("linux/lsb")
     allow(@plugin).to receive(:collect_os).and_return(:linux)
   end
 
   describe "on systems with /etc/lsb-release" do
-    before(:each) do
+    before do
       @double_file = double("/etc/lsb-release")
       allow(@double_file).to receive(:each)
         .and_yield("DISTRIB_ID=Ubuntu")
@@ -39,29 +39,29 @@ describe Ohai::System, "Linux lsb plugin" do
       allow(File).to receive(:exist?).with("/etc/lsb-release").and_return(true)
     end
 
-    it "should set lsb[:id]" do
+    it "sets lsb[:id]" do
       @plugin.run
       expect(@plugin[:lsb][:id]).to eq("Ubuntu")
     end
 
-    it "should set lsb[:release]" do
+    it "sets lsb[:release]" do
       @plugin.run
       expect(@plugin[:lsb][:release]).to eq("8.04")
     end
 
-    it "should set lsb[:codename]" do
+    it "sets lsb[:codename]" do
       @plugin.run
       expect(@plugin[:lsb][:codename]).to eq("hardy")
     end
 
-    it "should set lsb[:description]" do
+    it "sets lsb[:description]" do
       @plugin.run
       expect(@plugin[:lsb][:description]).to eq("Ubuntu 8.04")
     end
   end
 
   describe "on systems with /usr/bin/lsb_release" do
-    before(:each) do
+    before do
       allow(File).to receive(:exist?).with("/usr/bin/lsb_release").and_return(true)
 
       @stdin = double("STDIN", { close: true })
@@ -73,7 +73,7 @@ describe Ohai::System, "Linux lsb plugin" do
     end
 
     describe "on Centos 5.4 correctly" do
-      before(:each) do
+      before do
         @stdout = <<~LSB_RELEASE
           LSB Version: :core-3.1-ia32:core-3.1-noarch:graphics-3.1-ia32:graphics-3.1-noarch
           Distributor ID: CentOS
@@ -84,29 +84,29 @@ describe Ohai::System, "Linux lsb plugin" do
         allow(@plugin).to receive(:shell_out).with("lsb_release -a").and_return(mock_shell_out(0, @stdout, ""))
       end
 
-      it "should set lsb[:id]" do
+      it "sets lsb[:id]" do
         @plugin.run
         expect(@plugin[:lsb][:id]).to eq("CentOS")
       end
 
-      it "should set lsb[:release]" do
+      it "sets lsb[:release]" do
         @plugin.run
         expect(@plugin[:lsb][:release]).to eq("5.4")
       end
 
-      it "should set lsb[:codename]" do
+      it "sets lsb[:codename]" do
         @plugin.run
         expect(@plugin[:lsb][:codename]).to eq("Final")
       end
 
-      it "should set lsb[:description]" do
+      it "sets lsb[:description]" do
         @plugin.run
         expect(@plugin[:lsb][:description]).to eq("CentOS release 5.4 (Final)")
       end
     end
 
     describe "on Fedora 14 correctly" do
-      before(:each) do
+      before do
         @stdout = <<~LSB_RELEASE
           LSB Version:    :core-4.0-ia32:core-4.0-noarch
           Distributor ID: Fedora
@@ -117,29 +117,29 @@ describe Ohai::System, "Linux lsb plugin" do
         allow(@plugin).to receive(:shell_out).with("lsb_release -a").and_return(mock_shell_out(0, @stdout, ""))
       end
 
-      it "should set lsb[:id]" do
+      it "sets lsb[:id]" do
         @plugin.run
         expect(@plugin[:lsb][:id]).to eq("Fedora")
       end
 
-      it "should set lsb[:release]" do
+      it "sets lsb[:release]" do
         @plugin.run
         expect(@plugin[:lsb][:release]).to eq("14")
       end
 
-      it "should set lsb[:codename]" do
+      it "sets lsb[:codename]" do
         @plugin.run
         expect(@plugin[:lsb][:codename]).to eq("Laughlin")
       end
 
-      it "should set lsb[:description]" do
+      it "sets lsb[:description]" do
         @plugin.run
         expect(@plugin[:lsb][:description]).to eq("Fedora release 14 (Laughlin)")
       end
     end
   end
 
-  it "should not set any lsb values if /etc/lsb-release or /usr/bin/lsb_release do not exist " do
+  it "does not set any lsb values if /etc/lsb-release or /usr/bin/lsb_release do not exist " do
     allow(File).to receive(:exist?).with("/etc/lsb-release").and_return(false)
     allow(File).to receive(:exist?).with("/usr/bin/lsb_release").and_return(false)
     expect(@plugin.attribute?(:lsb)).to be(false)