ohai 15.2.5 → 15.3.1

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

@@ -19,7 +19,7 @@
 require "spec_helper"
 
 describe Ohai::System, "Solaris2.X hostname plugin" do
-  before(:each) do
+  before do
     @plugin = get_plugin("hostname")
     allow(@plugin).to receive(:collect_os).and_return(:solaris2)
     allow(@plugin).to receive(:resolve_fqdn).and_return("kitteh.inurfridge.eatinurfoodz")
@@ -29,7 +29,7 @@ describe Ohai::System, "Solaris2.X hostname plugin" do
 
   it_should_check_from("solaris2::hostname", "hostname", "hostname", "kitteh")
 
-  it "should get the fqdn value from #resolve_fqdn" do
+  it "gets the fqdn value from #resolve_fqdn" do
     @plugin.run
     expect(@plugin["fqdn"]).to eq("kitteh.inurfridge.eatinurfoodz")
   end

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

@@ -133,7 +133,7 @@ describe Ohai::System, "Solaris2.X kernel plugin" do
   146  121719e    28c   -   1  RT_DPTBL (realtime dispatch table)
   TOOMUCH
 
-  before(:each) do
+  before do
     @plugin = get_plugin("kernel")
     allow(@plugin).to receive(:collect_os).and_return(:solaris2)
     allow(@plugin).to receive(:init_kernel).and_return({})
@@ -143,21 +143,21 @@ describe Ohai::System, "Solaris2.X kernel plugin" do
     allow(File).to receive(:open).with("/etc/release").and_yield(@release)
   end
 
-  it "should give the Solaris update version information" do
+  it "gives the Solaris update version information" do
     @release = StringIO.new("                      Solaris 10 10/08 s10s_u6wos_07b SPARC\n Use is subject to license terms.\n Assembled 27 October 2008")
     allow(File).to receive(:open).with("/etc/release").and_yield(@release)
     @plugin.run
     expect(@plugin[:kernel][:update]).to eq("10 10/08 s10s_u6wos_07")
   end
 
-  it "should give the Oracle Solaris update version information" do
+  it "gives the Oracle Solaris update version information" do
     @release = StringIO.new("                   Oracle Solaris 10 1/13 s10s_u11wos_24a SPARC\n Assembled 17 January 2013")
     allow(File).to receive(:open).with("/etc/release").and_yield(@release)
     @plugin.run
     expect(@plugin[:kernel][:update]).to eq("10 1/13 s10s_u11wos_24")
   end
 
-  it "should give the Solaris 11 update version information" do
+  it "gives the Solaris 11 update version information" do
     @release = StringIO.new("                            Oracle Solaris 11.3 SPARC\n Assembled 25 July 2016")
     allow(File).to receive(:open).with("/etc/release").and_yield(@release)
     @plugin.run

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

@@ -17,7 +17,7 @@
 require "spec_helper"
 
 describe Ohai::System, "Solaris2.X memory plugin" do
-  before(:each) do
+  before do
     @plugin = get_plugin("solaris2/memory")
     allow(@plugin).to receive(:collect_os).and_return("solaris2")
     allow(@plugin).to receive(:shell_out).with("prtconf | grep Memory").and_return(mock_shell_out(0, "Memory size: 8194 Megabytes\n", ""))
@@ -25,17 +25,17 @@ describe Ohai::System, "Solaris2.X memory plugin" do
     allow(@plugin).to receive(:shell_out).with("swap -s").and_return(mock_shell_out(0, @swap_s, ""))
   end
 
-  it "should get the total memory" do
+  it "gets the total memory" do
     @plugin.run
     expect(@plugin[:memory][:total]).to eql("#{8194 * 1024}kB")
   end
 
-  it "should get total swap" do
+  it "gets total swap" do
     @plugin.run
     expect(@plugin[:memory][:swap][:total]).to eql("#{(470096232 + 47057688)}kB" )
   end
 
-  it "should get free swap" do
+  it "gets free swap" do
     @plugin.run
     expect(@plugin[:memory][:swap][:free]).to eql("47057688kB")
   end

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

@@ -19,14 +19,14 @@
 require "spec_helper"
 
 describe Ohai::System, "Solaris plugin platform" do
-  before(:each) do
+  before do
     @plugin = get_plugin("solaris2/platform")
     allow(@plugin).to receive(:collect_os).and_return(:solaris2)
     allow(@plugin).to receive(:shell_out).with("/sbin/uname -X")
   end
 
   describe "on SmartOS" do
-    before(:each) do
+    before do
       @uname_x = <<~UNAME_X
         System = SunOS
         Node = node.example.com
@@ -48,17 +48,17 @@ describe Ohai::System, "Solaris plugin platform" do
       allow(File).to receive(:open).with("/etc/release").and_yield(@release)
     end
 
-    it "should run uname and set platform and build" do
+    it "runs uname and set platform and build" do
       @plugin.run
       expect(@plugin[:platform_build]).to eq("joyent_20120130T201844Z")
     end
 
-    it "should set the platform" do
+    it "sets the platform" do
       @plugin.run
       expect(@plugin[:platform]).to eq("smartos")
     end
 
-    it "should set the platform_version" do
+    it "sets the platform_version" do
       @plugin.run
       expect(@plugin[:platform_version]).to eq("5.11")
     end
@@ -66,7 +66,7 @@ describe Ohai::System, "Solaris plugin platform" do
   end
 
   describe "on Solaris 11" do
-    before(:each) do
+    before do
       @uname_x = <<~UNAME_X
         System = SunOS
         Node = node.example.com
@@ -88,17 +88,17 @@ describe Ohai::System, "Solaris plugin platform" do
       allow(File).to receive(:open).with("/etc/release").and_yield(@release)
     end
 
-    it "should run uname and set platform and build" do
+    it "runs uname and set platform and build" do
       @plugin.run
       expect(@plugin[:platform_build]).to eq("11.1")
     end
 
-    it "should set the platform" do
+    it "sets the platform" do
       @plugin.run
       expect(@plugin[:platform]).to eq("solaris2")
     end
 
-    it "should set the platform_version" do
+    it "sets the platform_version" do
       @plugin.run
       expect(@plugin[:platform_version]).to eq("5.11")
     end

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

@@ -21,7 +21,7 @@ require "spec_helper"
 describe Ohai::System, "Solaris virtualization platform" do
   let(:plugin) { get_plugin("solaris2/virtualization") }
 
-  before(:each) do
+  before do
     @psrinfo_pv = <<~PSRINFO_PV
       The physical processor has 1 virtual processor (0)
         x86 (GenuineIntel family 6 model 2 step 3 clock 2667 MHz)
@@ -39,16 +39,16 @@ describe Ohai::System, "Solaris virtualization platform" do
   end
 
   describe "when we are checking for kvm" do
-    before(:each) do
+    before do
       expect(File).to receive(:exist?).with("/usr/sbin/psrinfo").and_return(true)
     end
 
-    it "should run psrinfo -pv" do
+    it "runs psrinfo -pv" do
       expect(plugin).to receive(:shell_out).with("#{Ohai.abs_path( "/usr/sbin/psrinfo" )} -pv")
       plugin.run
     end
 
-    it "Should set kvm guest if psrinfo -pv contains QEMU Virtual CPU" do
+    it "sets kvm guest if psrinfo -pv contains QEMU Virtual CPU" do
       allow(plugin).to receive(:shell_out).with("#{Ohai.abs_path( "/usr/sbin/psrinfo" )} -pv").and_return(mock_shell_out(0, "QEMU Virtual CPU", ""))
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("kvm")
@@ -56,7 +56,7 @@ describe Ohai::System, "Solaris virtualization platform" do
       expect(plugin[:virtualization][:systems][:kvm]).to eq("guest")
     end
 
-    it "should not set virtualization if kvm isn't there" do
+    it "does not set virtualization if kvm isn't there" do
       expect(plugin).to receive(:shell_out).with("#{Ohai.abs_path( "/usr/sbin/psrinfo" )} -pv").and_return(mock_shell_out(0, @psrinfo_pv, ""))
       plugin.run
       expect(plugin[:virtualization][:systems]).to eq({})
@@ -90,7 +90,7 @@ describe Ohai::System, "Solaris virtualization platform" do
     end
   end
 
-  it "should not set virtualization if no tests match" do
+  it "does not set virtualization if no tests match" do
     plugin.run
     expect(plugin[:virtualization][:systems]).to eq({})
   end

data/spec/unit/plugins/ssh_host_keys_spec.rb

@@ -20,7 +20,7 @@ require "spec_helper"
 
 describe Ohai::System, "ssh_host_key plugin" do
 
-  before(:each) do
+  before do
     @plugin = get_plugin("ssh_host_key")
     @plugin[:keys] = Mash.new
 
@@ -83,6 +83,7 @@ describe Ohai::System, "ssh_host_key plugin" do
         HostKey /etc/ssh/ssh_host_ed25519_key
       EOS
     end
+
     it_behaves_like "loads keys"
   end
 
@@ -96,6 +97,7 @@ describe Ohai::System, "ssh_host_key plugin" do
         #HostKey /etc/ssh/ssh_host_ed25519_key
       EOS
     end
+
     it_behaves_like "loads keys"
   end
 
@@ -103,6 +105,7 @@ describe Ohai::System, "ssh_host_key plugin" do
     let :sshd_config_file do
       nil
     end
+
     before do
       allow(File).to receive(:exist?).with("/etc/ssh/sshd_config").and_return(false)
       allow(File).to receive(:exist?).with("/etc/sshd_config").and_return(false)

data/spec/unit/plugins/sysconf_spec.rb

@@ -21,7 +21,7 @@ require "spec_helper"
 describe Ohai::System, "sysconf plugin", :unix_only do
   let(:plugin) { get_plugin("sysconf") }
 
-  it "should populate sysconf if getconf is found" do
+  it "populates sysconf if getconf is found" do
     getconf_out = <<~GETCONF_OUT
       LINK_MAX                           65000
       _POSIX_LINK_MAX                    65000
@@ -672,7 +672,7 @@ describe Ohai::System, "sysconf plugin", :unix_only do
     })
   end
 
-  it "should not populate sysconf if getconf is not found" do
+  it "does not populate sysconf if getconf is not found" do
     allow(plugin).to receive(:which).with("getconf").and_return(false)
     plugin.run
     expect(plugin[:sysconf]).to be(nil)

data/spec/unit/plugins/timezone_spec.rb

@@ -18,12 +18,12 @@
 require "spec_helper"
 
 describe Ohai::System, "timezone plugin" do
-  before(:each) do
+  before do
     @plugin = get_plugin("timezone")
     allow(Time).to receive_message_chain(:now, :getlocal, :zone) { "ZZZ" }
   end
 
-  it "should get the local timezone" do
+  it "gets the local timezone" do
     @plugin.run
     expect(@plugin["time"]["timezone"]).to eq("ZZZ")
   end

data/spec/unit/plugins/virtualbox_spec.rb

@@ -299,13 +299,13 @@ EOF
 describe Ohai::System, "plugin virtualbox" do
   let(:plugin) { get_plugin("virtualbox") }
 
-  before(:each) do
+  before do
     plugin[:virtualization] = Mash.new
     plugin[:virtualization][:systems] = Mash.new
   end
 
   context "when not on a virtualbox guest" do
-    it "should not set the virtualbox attribute" do
+    it "does not set the virtualbox attribute" do
       plugin[:virtualization][:systems][:vmware] = "host"
       plugin.run
       expect(plugin).not_to have_key(:virtualbox)
@@ -314,7 +314,7 @@ describe Ohai::System, "plugin virtualbox" do
 
   context "when on a vbox guest" do
     context "when VBoxControl shellout fails" do
-      it "should not set the virtualbox attribute" do
+      it "does not set the virtualbox attribute" do
         plugin[:virtualization][:systems][:vbox] = "guest"
         allow(plugin).to receive(:shell_out).with("VBoxControl guestproperty enumerate").and_return(mock_shell_out(1, "", ""))
         plugin.run
@@ -323,29 +323,29 @@ describe Ohai::System, "plugin virtualbox" do
     end
 
     context "when VBoxControl shellout succeeds" do
-      before(:each) do
+      before do
         plugin[:virtualization][:systems][:vbox] = "guest"
         allow(plugin).to receive(:shell_out).with("VBoxControl guestproperty enumerate").and_return(mock_shell_out(0, vbox_output, ""))
         plugin.run
       end
 
-      it "should set the host version" do
+      it "sets the host version" do
         expect(plugin[:virtualbox][:host][:version]).to eql("5.0.10")
       end
 
-      it "should set the host revision" do
+      it "sets the host revision" do
         expect(plugin[:virtualbox][:host][:revision]).to eql("104061")
       end
 
-      it "should set the host language" do
+      it "sets the host language" do
         expect(plugin[:virtualbox][:host][:language]).to eql("en_US")
       end
 
-      it "should set the guest additions version" do
+      it "sets the guest additions version" do
         expect(plugin[:virtualbox][:guest][:guest_additions_version]).to eql("5.0.2")
       end
 
-      it "should set the guest additions revision" do
+      it "sets the guest additions revision" do
         expect(plugin[:virtualbox][:guest][:guest_additions_revision]).to eql("102096")
       end
     end
@@ -353,7 +353,7 @@ describe Ohai::System, "plugin virtualbox" do
 
   context "when on a vbox host" do
     context "if the host has virtualbox installed" do
-      it "should create a vbox attribute with accurate data" do
+      it "creates a vbox attribute with accurate data" do
         plugin[:virtualization][:systems][:vbox] = "host"
         allow(plugin).to receive(:which).with("VBoxManage").and_return("/usr/bin/VBoxManage")
         allow(plugin).to receive(:shell_out).with("VBoxManage list --sorted vms").and_return(mock_shell_out(0, vbox_list_vms_stdout, ""))

data/spec/unit/plugins/vmware_spec.rb

@@ -21,12 +21,12 @@ describe Ohai::System, "plugin vmware" do
   let(:plugin) { get_plugin("vmware") }
   let(:path) { "/usr/bin/vmware-toolbox-cmd" }
 
-  before(:each) do
+  before do
     allow(plugin).to receive(:collect_os).and_return(:linux)
   end
 
   context "on vmware guest with toolbox installed" do
-    before(:each) do
+    before do
       allow(File).to receive(:exist?).with("/usr/bin/vmware-toolbox-cmd").and_return(true)
       allow(plugin).to receive(:shell_out).with("#{path} stat speed").and_return(mock_shell_out(0, "2000 MHz", nil))
       allow(plugin).to receive(:shell_out).with("#{path} stat hosttime").and_return(mock_shell_out(0, "04 Jun 2015 19:21:16", nil))
@@ -59,7 +59,7 @@ describe Ohai::System, "plugin vmware" do
   end
 
   context "on vmware guest without toolbox" do
-    it "should not create a vmware attribute" do
+    it "does not create a vmware attribute" do
       plugin[:virtualization] = Mash.new
       plugin[:virtualization][:systems] = Mash.new
       plugin[:virtualization][:systems][:vmware] = Mash.new
@@ -70,7 +70,7 @@ describe Ohai::System, "plugin vmware" do
   end
 
   context "on vbox guest" do
-    it "should not create a vmware attribute" do
+    it "does not create a vmware attribute" do
       plugin[:virtualization] = Mash.new
       plugin[:virtualization][:systems] = Mash.new
       plugin[:virtualization][:systems][:vbox] = Mash.new

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

@@ -20,48 +20,48 @@ require "spec_helper"
 
 shared_examples "a cpu" do |cpu_no|
   describe "cpu #{cpu_no}" do
-    it "should set physical_id to CPU#{cpu_no}" do
+    it "sets physical_id to CPU#{cpu_no}" do
       expect(@plugin[:cpu][cpu_no.to_s][:physical_id]).to eq("CPU#{cpu_no}")
     end
 
-    it "should set mhz to 2793" do
+    it "sets mhz to 2793" do
       expect(@plugin[:cpu][cpu_no.to_s][:mhz]).to eq("2793")
     end
 
-    it "should set vendor_id to GenuineIntel" do
+    it "sets vendor_id to GenuineIntel" do
       expect(@plugin[:cpu][cpu_no.to_s][:vendor_id]).to eq("GenuineIntel")
     end
 
-    it "should set model_name to Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz" do
+    it "sets model_name to Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz" do
       expect(@plugin[:cpu][cpu_no.to_s][:model_name])
         .to eq("Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz")
     end
 
-    it "should set description to Intel64 Family 6 Model 70 Stepping 1" do
+    it "sets description to Intel64 Family 6 Model 70 Stepping 1" do
       expect(@plugin[:cpu][cpu_no.to_s][:description])
         .to eq("Intel64 Family 6 Model 70 Stepping 1")
     end
 
-    it "should set model to 17921" do
+    it "sets model to 17921" do
       expect(@plugin[:cpu][cpu_no.to_s][:model]).to eq("17921")
     end
 
-    it "should set family to 2" do
+    it "sets family to 2" do
       expect(@plugin[:cpu][cpu_no.to_s][:family]).to eq("2")
     end
 
-    it "should set stepping to 9" do
+    it "sets stepping to 9" do
       expect(@plugin[:cpu][cpu_no.to_s][:stepping]).to eq(9)
     end
 
-    it "should set cache_size to 64 KB" do
+    it "sets cache_size to 64 KB" do
       expect(@plugin[:cpu][cpu_no.to_s][:cache_size]).to eq("64 KB")
     end
   end
 end
 
 describe Ohai::System, "Windows cpu plugin" do
-  before(:each) do
+  before do
     @plugin = get_plugin("cpu")
     allow(@plugin).to receive(:collect_os).and_return(:windows)
 
@@ -100,15 +100,15 @@ describe Ohai::System, "Windows cpu plugin" do
     @plugin.run
   end
 
-  it "should set total cpu to 2" do
+  it "sets total cpu to 2" do
     expect(@plugin[:cpu][:total]).to eq(4)
   end
 
-  it "should set real cpu to 2" do
+  it "sets real cpu to 2" do
     expect(@plugin[:cpu][:real]).to eq(2)
   end
 
-  it "should set 2 distinct cpus numbered 0 and 1" do
+  it "sets 2 distinct cpus numbered 0 and 1" do
     expect(@plugin[:cpu]).to have_key("0")
     expect(@plugin[:cpu]).to have_key("1")
   end

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

@@ -66,7 +66,7 @@ describe Ohai::System, "Windows Filesystem Plugin", :windows_only do
     WmiLite::WmiException.new(exception, :ConnectServer, @namespace)
   end
 
-  before(:each) do
+  before do
     allow(plugin).to receive(:collect_os).and_return(:windows)
   end