ohai 15.2.5 → 15.3.1

data/spec/unit/plugins/scala_spec.rb

@@ -34,7 +34,7 @@ describe Ohai::System, "plugin scala" do
   end
 
   context "if scala is installed" do
-    before(:each) do
+    before do
       setup_plugin
       plugin.run
     end
@@ -45,7 +45,7 @@ describe Ohai::System, "plugin scala" do
   end
 
   context "if scala is not installed" do
-    before(:each) do
+    before do
       allow(plugin).to receive(:shell_out)
         .and_raise( Ohai::Exceptions::Exec )
       plugin.run

data/spec/unit/plugins/scaleway_spec.rb

@@ -20,13 +20,13 @@ require "spec_helper"
 describe Ohai::System, "plugin scaleway" do
   let(:plugin) { get_plugin("scaleway") }
 
-  before(:each) do
+  before do
     allow(plugin).to receive(:hint?).with("scaleway").and_return(false)
     allow(File).to receive(:read).with("/proc/cmdline").and_return(false)
   end
 
   shared_examples_for "!scaleway" do
-    it "should NOT attempt to fetch the scaleway metadata" do
+    it "does not attempt to fetch the scaleway metadata" do
       expect(plugin).not_to receive(:http_client)
       expect(plugin[:scaleway]).to be_nil
       plugin.run
@@ -34,7 +34,7 @@ describe Ohai::System, "plugin scaleway" do
   end
 
   shared_examples_for "scaleway" do
-    before(:each) do
+    before do
       @http_client = double("Net::HTTP client")
       allow(plugin).to receive(:http_client).and_return(@http_client)
       allow(IO).to receive(:select).and_return([[], [1], []])
@@ -48,7 +48,7 @@ describe Ohai::System, "plugin scaleway" do
       '{"tags": [], "state_detail": "booted", "public_ip": {"dynamic": false, "id": "7564c721-a128-444e-9c95-0754a7616482", "address": "5.1.9.3"}, "ssh_public_keys": [{"key": "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEA5qK2s41yyrNpaXXiQtb/1ADaVHVZZp9rYEtG6Dz7trOPtxkxNsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/j2C+NAzo6TZCLTbJjBf89ieazqVqhY/dMNLDJINY2Ss2ytgyiJm9bp5bYcZz441czijBlmY/qmI0cFCVOJoDq6X9Lmn/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee+hmLFaTE3FeMr1hmeZT2ChH6ruHi8m6m18SfW0fl2fS8zG4yB+WE2IawdsoZmtgtY/Re3CpvhYP9S/JxpUedl+zzzzzzzzzzzzzzzzz5+YONBAt/PWMelXThfMukbwykto6IXmsX2qflBPsRVrWe0D7vt48loVScHDv5D05ZwqWY9rizFqCx3Y8xCLr6649ieonnnjHEsSOBREU507eXVJL6njHard+s+vuTC4bNH5LiP2INQS+9MaT37/l8WzIAL3U+hvcj95HS8KfATX+7XWa54bGJgeOnPle8ojwp1ssl7ddh2yFJozgk2CkUEyE4f1lmEX2YFJGoEoaW0QC2j0nNYiLs37yHG0h84AOgjoIAJo1rxpBAGGJOgFTkgnSdHjtDZsC9WjJYeu/QpxQ7Lf2Z+FCKoypfnZz/F10/z6nxnkZ3IKKM=", "fingerprint": "4096 4c:71:db:64:cd:24:da:4a:fa:5f:9e:70:af:ea:40:6e  (no comment) (RSA)"}], "private_ip": "10.8.23.7", "timezone": "UTC", "id": "77fab916-e7ff-44c6-a025-ae08837b4c4f", "extra_networks": [], "name": "sample-hostname", "hostname": "sample-hostname", "bootscript": {"kernel": "http://169.254.42.24/kernel/x86_64-4.9.20-std-1/vmlinuz-4.9.20-std-1", "title": "x86_64 4.9.20 std #1 (longterm/latest)", "default": false, "dtb": "", "public": false, "initrd": "http://169.254.42.24/initrd/initrd-Linux-x86_64-v3.12.7.gz", "bootcmdargs": "LINUX_COMMON scaleway boot=local", "architecture": "x86_64", "organization": "11111110-1112-4112-8112-111111111116", "id": "855f21ba-e7f9-421d-91b0-976a6ad59910"}, "location": {"platform_id": "21", "hypervisor_id": "518", "node_id": "4", "cluster_id": "82", "zone_id": "par1"}, "volumes": {"0": {"name": "x86_64-debian-stretch-2017-06-29_10:17", "modification_date": "2018-01-26T10:22:28.268074+00:00", "export_uri": "device://dev/vda", "volume_type": "l_ssd", "creation_date": "2018-01-26T10:22:28.268074+00:00", "organization": "90f39224-d0a2-4771-a2f0-1036a9402b97", "server": {"id": "77fab916-e7ff-44c6-a024-ae08837b4c4f", "name": "sample-hostname"}, "id": "3be53d4d-93d7-4430-a513-61cb4410624b", "size": 50000000000}}, "ipv6": null, "organization": "89f39224-d0a2-4771-a2f0-1036a9402b97", "commercial_type": "VC1S"}'
     end
 
-    it "should fetch and properly parse json metadata" do
+    it "fetches and properly parse json metadata" do
       expect(@http_client).to receive(:get)
         .with("/conf?format=json")
         .and_return(double("Net::HTTP Response", body: body, code: "200"))
@@ -59,7 +59,7 @@ describe Ohai::System, "plugin scaleway" do
       expect(plugin[:scaleway]["hostname"]).to eq("sample-hostname")
     end
 
-    it "should complete the run despite unavailable metadata" do
+    it "completes the run despite unavailable metadata" do
       expect(@http_client).to receive(:get)
         .with("/conf?format=json")
         .and_return(double("Net::HTTP Response", body: "", code: "404"))
@@ -70,22 +70,24 @@ describe Ohai::System, "plugin scaleway" do
   end
 
   describe "without hint or cmdline" do
-    it_should_behave_like "!scaleway"
+    it_behaves_like "!scaleway"
   end
 
   describe "with scaleway hint file" do
-    it_should_behave_like "scaleway"
-
-    before(:each) do
+    before do
       allow(plugin).to receive(:hint?).with("scaleway").and_return(true)
     end
+
+    it_behaves_like "scaleway"
+
   end
 
   describe "with scaleway cmdline" do
-    it_should_behave_like "scaleway"
-
-    before(:each) do
+    before do
       allow(File).to receive(:read).with("/proc/cmdline").and_return("initrd=initrd showopts console=ttyS0,115200 nousb vga=0 root=/dev/vda scaleway boot=local")
     end
+
+    it_behaves_like "scaleway"
+
   end
 end

data/spec/unit/plugins/scsi_spec.rb

@@ -20,7 +20,8 @@ require "spec_helper"
 
 describe Ohai::System, "lsscsi plugin" do
   let(:plugin) { get_plugin("scsi") }
-  before(:each) do
+
+  before do
     allow(plugin).to receive(:collect_os).and_return(:linux)
     @stdout = <<~LSSCSI
       [5:0:0:0]    disk    ATA      Hitachi HUA72205 A3EA  /dev/sda

data/spec/unit/plugins/shard_spec.rb

@@ -20,6 +20,11 @@ require "digest/md5"
 require "spec_helper"
 
 describe Ohai::System, "shard plugin" do
+  subject do
+    plugin.run
+    plugin[:shard_seed]
+  end
+
   let(:plugin) { get_plugin("shard") }
   let(:fqdn) { "somehost004.someregion.somecompany.com" }
   let(:uuid) { "48555CF4-5BB1-21D9-BC4C-E8B73DDE5801" }
@@ -29,12 +34,7 @@ describe Ohai::System, "shard plugin" do
   let(:fips) { false }
   let(:os) { "linux" }
 
-  subject do
-    plugin.run
-    plugin[:shard_seed]
-  end
-
-  before(:each) do
+  before do
     plugin["machinename"] = machinename
     plugin["machine_id"] = machine_id
     plugin["fqdn"] = fqdn
@@ -45,11 +45,11 @@ describe Ohai::System, "shard plugin" do
     allow(plugin).to receive(:collect_os).and_return(os)
   end
 
-  it "should provide a shard with a default-safe set of sources" do
+  it "provides a shard with a default-safe set of sources" do
     expect(subject).to eq(27767217)
   end
 
-  it "should provide a shard with a configured source" do
+  it "provides a shard with a configured source" do
     Ohai.config[:plugin][:shard_seed][:sources] = [:fqdn]
     expect(subject).to eq(203669792)
   end
@@ -59,26 +59,28 @@ describe Ohai::System, "shard plugin" do
     expect { subject }.to raise_error(RuntimeError)
   end
 
-  it "should provide a shard with a configured algorithm" do
+  it "provides a shard with a configured algorithm" do
     Ohai.config[:plugin][:shard_seed][:digest_algorithm] = "sha256"
-    expect(Digest::MD5).to_not receive(:new)
+    expect(Digest::MD5).not_to receive(:new)
     expect(subject).to eq(117055036)
   end
 
   context "with Darwin OS" do
     let(:os) { "darwin" }
+
     before do
       plugin.data.delete("fips") # FIPS is undefined on Macs, make sure this still work
       plugin["hardware"] = { "serial_number" => serial, "platform_UUID" => uuid }
     end
 
-    it "should provide a shard with a default-safe set of sources" do
+    it "provides a shard with a default-safe set of sources" do
       expect(subject).to eq(27767217)
     end
   end
 
   context "with Windows OS" do
     let(:os) { "windows" }
+
     before do
       wmi = double("WmiLite::Wmi")
       allow(WmiLite::Wmi).to receive(:new).and_return(wmi)
@@ -88,11 +90,11 @@ describe Ohai::System, "shard plugin" do
       plugin.data.delete("dmi") # To make sure we aren't using the wrong data.
     end
 
-    it "should provide a shard with a default-safe set of sources" do
+    it "provides a shard with a default-safe set of sources" do
       expect(subject).to eq(27767217)
     end
 
-    it "should allow os_serial source" do
+    it "allows os_serial source" do
       Ohai.config[:plugin][:shard_seed][:sources] = %i{machinename os_serial uuid}
       # Different from above.
       expect(subject).to eq(178738102)
@@ -102,7 +104,7 @@ describe Ohai::System, "shard plugin" do
   context "with a weird OS" do
     let(:os) { "aix" }
 
-    it "should provide a shard with a default-safe set of sources" do
+    it "provides a shard with a default-safe set of sources" do
       # Note: this is different than the other defaults.
       expect(subject).to eq(253499154)
     end
@@ -111,8 +113,8 @@ describe Ohai::System, "shard plugin" do
   context "with FIPS mode enabled" do
     let(:fips) { true }
 
-    it "should use SHA2" do
-      expect(Digest::MD5).to_not receive(:hexdigest)
+    it "uses SHA2" do
+      expect(Digest::MD5).not_to receive(:hexdigest)
       expect(subject).to eq(117055036)
     end
   end

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

@@ -17,13 +17,13 @@
 require "spec_helper"
 
 describe Ohai::System, "Solaris2.X cpu plugin" do
-  before(:each) do
+  before do
     @plugin = get_plugin("cpu")
     allow(@plugin).to receive(:collect_os).and_return("solaris2")
   end
 
   describe "on x86 processors" do
-    before(:each) do
+    before do
       kstatinfo_output = <<~END
         cpu_info:0:cpu_info0:brand      Crazy(r) Argon(r) CPU           Y5570  @ 1.93GHz
         cpu_info:0:cpu_info0:cache_id   1
@@ -446,28 +446,28 @@ describe Ohai::System, "Solaris2.X cpu plugin" do
       @plugin.run
     end
 
-    it "should get the total virtual processor count" do
+    it "gets the total virtual processor count" do
       expect(@plugin["cpu"]["total"]).to eql(16)
     end
 
-    it "should get the total processor count" do
+    it "gets the total processor count" do
       expect(@plugin["cpu"]["real"]).to eql(2)
     end
 
-    it "should get the number of threads per core" do
+    it "gets the number of threads per core" do
       expect(@plugin["cpu"]["corethreads"]).to eql(2)
     end
 
-    it "should get the total number of online cores" do
+    it "gets the total number of online cores" do
       expect(@plugin["cpu"]["cpustates"]["on-line"]).to eql(8)
     end
 
-    it "should get the total number of offline cores" do
+    it "gets the total number of offline cores" do
       expect(@plugin["cpu"]["cpustates"]["off-line"]).to eql(8)
     end
 
     describe "per-cpu information" do
-      it "should include processor vendor_ids" do
+      it "includes processor vendor_ids" do
         # CPU Socket 0
         expect(@plugin["cpu"]["15"]["vendor_id"]).to eql("GenuineIntel")
         expect(@plugin["cpu"]["13"]["vendor_id"]).to eql("GenuineIntel")
@@ -488,7 +488,7 @@ describe Ohai::System, "Solaris2.X cpu plugin" do
         expect(@plugin["cpu"]["0"]["vendor_id"]).to eql("CrazyTown")
       end
 
-      it "should include processor families" do
+      it "includes processor families" do
         expect(@plugin["cpu"]["15"]["family"]).to eql("6")
         expect(@plugin["cpu"]["13"]["family"]).to eql("6")
         expect(@plugin["cpu"]["11"]["family"]).to eql("6")
@@ -508,7 +508,7 @@ describe Ohai::System, "Solaris2.X cpu plugin" do
         expect(@plugin["cpu"]["0"]["family"]).to eql("12")
       end
 
-      it "should include processor models" do
+      it "includes processor models" do
         expect(@plugin["cpu"]["15"]["model"]).to eql("26")
         expect(@plugin["cpu"]["13"]["model"]).to eql("26")
         expect(@plugin["cpu"]["11"]["model"]).to eql("26")
@@ -528,7 +528,7 @@ describe Ohai::System, "Solaris2.X cpu plugin" do
         expect(@plugin["cpu"]["0"]["model"]).to eql("93")
       end
 
-      it "should includ processor architecture" do
+      it "includs processor architecture" do
         expect(@plugin["cpu"]["15"]["arch"]).to eql("i386")
         expect(@plugin["cpu"]["13"]["arch"]).to eql("i386")
         expect(@plugin["cpu"]["11"]["arch"]).to eql("i386")
@@ -548,7 +548,7 @@ describe Ohai::System, "Solaris2.X cpu plugin" do
         expect(@plugin["cpu"]["0"]["arch"]).to eql("i386")
       end
 
-      it "should include processor stepping" do
+      it "includes processor stepping" do
         expect(@plugin["cpu"]["15"]["stepping"]).to eql("5")
         expect(@plugin["cpu"]["13"]["stepping"]).to eql("5")
         expect(@plugin["cpu"]["11"]["stepping"]).to eql("5")
@@ -569,7 +569,7 @@ describe Ohai::System, "Solaris2.X cpu plugin" do
 
       end
 
-      it "should include processor model names" do
+      it "includes processor model names" do
         expect(@plugin["cpu"]["15"]["model_name"]).to eql("Intel(r) Xeon(r) CPU X5570 @ 2.93GHz")
         expect(@plugin["cpu"]["13"]["model_name"]).to eql("Intel(r) Xeon(r) CPU X5570 @ 2.93GHz")
         expect(@plugin["cpu"]["11"]["model_name"]).to eql("Intel(r) Xeon(r) CPU X5570 @ 2.93GHz")
@@ -588,7 +588,7 @@ describe Ohai::System, "Solaris2.X cpu plugin" do
         expect(@plugin["cpu"]["0"]["model_name"]).to eql("Crazy(r) Argon(r) CPU Y5570 @ 1.93GHz")
       end
 
-      it "should include processor speed in MHz" do
+      it "includes processor speed in MHz" do
         expect(@plugin["cpu"]["15"]["mhz"]).to eql("2926")
         expect(@plugin["cpu"]["13"]["mhz"]).to eql("2926")
         expect(@plugin["cpu"]["11"]["mhz"]).to eql("2926")
@@ -607,7 +607,7 @@ describe Ohai::System, "Solaris2.X cpu plugin" do
         expect(@plugin["cpu"]["0"]["mhz"]).to eql("1933")
       end
 
-      it "should include processor state" do
+      it "includes processor state" do
         expect(@plugin["cpu"]["15"]["state"]).to eql("on-line")
         expect(@plugin["cpu"]["13"]["state"]).to eql("on-line")
         expect(@plugin["cpu"]["11"]["state"]).to eql("on-line")
@@ -629,7 +629,7 @@ describe Ohai::System, "Solaris2.X cpu plugin" do
   end
 
   describe "on sparc processors" do
-    before(:each) do
+    before do
       kstatinfo_output = <<~END
         cpu_info:0:cpu_info0:brand	SPARC-T3
         cpu_info:0:cpu_info0:chip_id	0
@@ -2812,32 +2812,32 @@ describe Ohai::System, "Solaris2.X cpu plugin" do
       @plugin.run
     end
 
-    it "should get the total virtual processor count" do
+    it "gets the total virtual processor count" do
       expect(@plugin["cpu"]["total"]).to eql(128)
     end
 
-    it "should get the total processor count" do
+    it "gets the total processor count" do
       expect(@plugin["cpu"]["real"]).to eql(1)
     end
 
-    it "should get the total core count" do
+    it "gets the total core count" do
       expect(@plugin["cpu"]["cores"]).to eql(16)
     end
 
-    it "should get the number of threads per core" do
+    it "gets the number of threads per core" do
       expect(@plugin["cpu"]["corethreads"]).to eql(8)
     end
 
-    it "should get the total number of online cores" do
+    it "gets the total number of online cores" do
       expect(@plugin["cpu"]["cpustates"]["on-line"]).to eql(124)
     end
 
-    it "should get the total number of offline cores" do
+    it "gets the total number of offline cores" do
       expect(@plugin["cpu"]["cpustates"]["off-line"]).to eql(4)
     end
 
     describe "per-cpu information" do
-      it "should include processor model names" do
+      it "includes processor model names" do
         expect(@plugin["cpu"]["0"]["model_name"]).to eql("SPARC-T3")
         expect(@plugin["cpu"]["1"]["model_name"]).to eql("SPARC-T3")
         expect(@plugin["cpu"]["2"]["model_name"]).to eql("SPARC-T3")
@@ -2848,7 +2848,7 @@ describe Ohai::System, "Solaris2.X cpu plugin" do
         expect(@plugin["cpu"]["127"]["model_name"]).to eql("SPARC-T4")
       end
 
-      it "should include processor sockets" do
+      it "includes processor sockets" do
         expect(@plugin["cpu"]["0"]["socket"]).to eql("0")
         expect(@plugin["cpu"]["1"]["socket"]).to eql("0")
         expect(@plugin["cpu"]["2"]["socket"]).to eql("0")
@@ -2859,7 +2859,7 @@ describe Ohai::System, "Solaris2.X cpu plugin" do
         expect(@plugin["cpu"]["127"]["socket"]).to eql("0")
       end
 
-      it "should include processor MHz" do
+      it "includes processor MHz" do
         expect(@plugin["cpu"]["0"]["mhz"]).to eql("1649")
         expect(@plugin["cpu"]["1"]["mhz"]).to eql("1649")
         expect(@plugin["cpu"]["2"]["mhz"]).to eql("1649")
@@ -2870,7 +2870,7 @@ describe Ohai::System, "Solaris2.X cpu plugin" do
         expect(@plugin["cpu"]["127"]["mhz"]).to eql("1649")
       end
 
-      it "should include processor core IDs" do
+      it "includes processor core IDs" do
         expect(@plugin["cpu"]["0"]["core_id"]).to eql("1026")
         expect(@plugin["cpu"]["8"]["core_id"]).to eql("1033")
         expect(@plugin["cpu"]["16"]["core_id"]).to eql("1040")
@@ -2889,7 +2889,7 @@ describe Ohai::System, "Solaris2.X cpu plugin" do
         expect(@plugin["cpu"]["120"]["core_id"]).to eql("1131")
       end
 
-      it "should include processor architecture" do
+      it "includes processor architecture" do
         expect(@plugin["cpu"]["0"]["arch"]).to eql("sparcv9")
         expect(@plugin["cpu"]["1"]["arch"]).to eql("sparcv9")
         expect(@plugin["cpu"]["2"]["arch"]).to eql("sparcv9")
@@ -2900,7 +2900,7 @@ describe Ohai::System, "Solaris2.X cpu plugin" do
         expect(@plugin["cpu"]["127"]["arch"]).to eql("sparcv9")
       end
 
-      it "should include processor FPU type" do
+      it "includes processor FPU type" do
         expect(@plugin["cpu"]["0"]["fpu_type"]).to eql("sparcv9")
         expect(@plugin["cpu"]["1"]["fpu_type"]).to eql("sparcv9")
         expect(@plugin["cpu"]["2"]["fpu_type"]).to eql("sparcv9")
@@ -2911,7 +2911,7 @@ describe Ohai::System, "Solaris2.X cpu plugin" do
         expect(@plugin["cpu"]["127"]["fpu_type"]).to eql("sparcv9")
       end
 
-      it "should include processor state" do
+      it "includes processor state" do
         expect(@plugin["cpu"]["0"]["state"]).to eql("on-line")
         expect(@plugin["cpu"]["1"]["state"]).to eql("on-line")
         expect(@plugin["cpu"]["2"]["state"]).to eql("on-line")

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

@@ -112,14 +112,14 @@ SOLARIS_DMI_OUT = <<~EOS.freeze
 EOS
 
 describe Ohai::System, "Solaris2.X DMI plugin" do
-  before(:each) do
+  before do
     @plugin = get_plugin("solaris2/dmi")
     allow(@plugin).to receive(:collect_os).and_return("solaris2")
     @stdout = SOLARIS_DMI_OUT
     allow(@plugin).to receive(:shell_out).with("smbios").and_return(mock_shell_out(0, @stdout, ""))
   end
 
-  it "should run smbios" do
+  it "runs smbios" do
     expect(@plugin).to receive(:shell_out).with("smbios").and_return(mock_shell_out(0, @stdout, ""))
     @plugin.run
   end
@@ -139,14 +139,14 @@ describe Ohai::System, "Solaris2.X DMI plugin" do
     },
   }.each do |id, data|
     data.each do |attribute, value|
-      it "should have [:dmi][:#{id}][:#{attribute}] set" do
+      it "has [:dmi][:#{id}][:#{attribute}] set" do
         @plugin.run
         expect(@plugin[:dmi][id][attribute]).to eql(value)
       end
     end
   end
 
-  it "should ignore unwanted types" do
+  it "ignores unwanted types" do
     @plugin.run
     expect(@plugin[:dmi]).not_to have_key(:on_board_devices)
   end

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

@@ -20,14 +20,14 @@ require_relative "spec_helper"
 describe Ohai::System, "Solaris2.X filesystem plugin" do
   let(:plugin) { get_plugin("filesystem") }
 
-  before(:each) do
+  before do
     allow(plugin).to receive(:collect_os).and_return("solaris2")
   end
 
   describe "filesystem properties" do
     let(:plugin_config) { {} }
 
-    before(:each) do
+    before do
       @original_plugin_config = Ohai.config[:plugin]
       Ohai.config[:plugin] = plugin_config
       allow(plugin).to receive(:shell_out).with("df -Pka").and_return(mock_shell_out(0, "", ""))
@@ -326,7 +326,7 @@ describe Ohai::System, "Solaris2.X filesystem plugin" do
       ZFS_GET
     end
 
-    after(:each) do
+    after do
       Ohai.config[:plugin] = @original_plugin_config
     end