ohai 15.2.5 → 15.3.1

data/spec/unit/dsl/plugin_spec.rb

@@ -155,7 +155,7 @@ shared_examples "Ohai::DSL::Plugin" do
   end
 
   context "when getting attributes" do
-    before(:each) do
+    before do
       plugin.set_attribute(:tea, "is soothing")
     end
 
@@ -170,7 +170,7 @@ shared_examples "Ohai::DSL::Plugin" do
     end
 
     describe "a top-level attribute" do
-      before(:each) do
+      before do
         plugin.set_attribute(:tea, "is soothing")
       end
 
@@ -196,7 +196,7 @@ shared_examples "Ohai::DSL::Plugin" do
     end
 
     describe "a nested attribute" do
-      before(:each) do
+      before do
         plugin.set_attribute(:the_monarch, { arch_rival: "dr_venture" })
       end
 
@@ -304,7 +304,7 @@ shared_examples "Ohai::DSL::Plugin" do
     end
 
     describe "a nested attribute" do
-      before(:each) do
+      before do
         plugin.set_attribute(:the_monarch, { arch_rival: "dr_venture" })
       end
 
@@ -383,9 +383,10 @@ end
 
 describe Ohai::DSL::Plugin::VersionVII do
   let(:logger) { Ohai::Log }
+
   it "does not modify the plugin name when the plugin is named correctly" do
     plugin = Ohai.plugin(:FunkyVALIDpluginName) {}.new({}, logger)
-    expect(plugin.name).to eql(:FunkyVALIDpluginName)
+    expect(plugin.name).to be(:FunkyVALIDpluginName)
   end
 
   describe "when the plugin is named incorrectly" do
@@ -411,7 +412,7 @@ describe Ohai::DSL::Plugin::VersionVII do
   describe "#version" do
     it "saves the plugin version as :version7" do
       plugin = Ohai.plugin(:Test) {}
-      expect(plugin.version).to eql(:version7)
+      expect(plugin.version).to be(:version7)
     end
   end
 
@@ -575,7 +576,7 @@ describe Ohai::DSL::Plugin::VersionVII do
 
       it "does not auto-vivify an un-configured plugin" do
         plugin.configuration(:foo)
-        expect(Ohai.config[:plugin]).to_not have_key(:test)
+        expect(Ohai.config[:plugin]).not_to have_key(:test)
       end
 
       it "returns nil when the option is not configured" do

data/spec/unit/mixin/command_spec.rb

@@ -30,14 +30,14 @@ describe Ohai::Mixin::Command, "shell_out" do
 
   let(:logger) { instance_double("Mixlib::Log::Child", trace: nil, debug: nil, warn: nil) }
 
-  before(:each) do
+  before do
     allow(Ohai::Mixin::Command).to receive(:logger).and_return(logger)
     allow(Ohai::Mixin::Command).to receive(:name).and_return(plugin_name)
     @original_env = ENV.to_hash
     ENV.clear
   end
 
-  after(:each) do
+  after do
     ENV.clear
     ENV.update(@original_env)
   end

data/spec/unit/mixin/dmi_decode.rb

@@ -23,6 +23,7 @@ describe Ohai::Mixin::DmiDecode, "guest_from_dmi_data" do
   let(:mixin) { Object.new.extend(Ohai::Mixin::DmiDecode) }
 
   # for the full DMI data used in these tests see https://github.com/chef/dmidecode_collection
+  # the fields here are manufacturer, product, and version as passed to #guest_from_dmi_data
   {
     xen: ["Xen", "HVM domU", "4.2.amazon"],
     vmware: ["VMware, Inc.", "VMware Virtual Platform", "None"],
@@ -31,7 +32,7 @@ describe Ohai::Mixin::DmiDecode, "guest_from_dmi_data" do
     veertu: ["Veertu", "Veertu", "Not Specified"],
     parallels: ["Parallels Software International Inc.", "Parallels Virtual Platform", "None"],
     vbox: ["Oracle Corporation", "VirtualBox", "1.2"],
-    openstack: ["Red Hat Inc.", "OpenStack Nova", "2014.1.2-1.el6"],
+    openstack: ["OpenStack Foundation", "", "15.1.5"],
     kvm: ["Red Hat", "KVM", "RHEL 7.0.0 PC (i440FX + PIIX, 1996"],
     bhyve: ["", "BHYVE", "1.0"],
   }.each_pair do |hypervisor, values|
@@ -42,6 +43,12 @@ describe Ohai::Mixin::DmiDecode, "guest_from_dmi_data" do
     end
   end
 
+  describe "when passed Redhat's Openstack varient dmi data" do
+    it "returns 'openstack'" do
+      expect(mixin.guest_from_dmi_data("Red Hat Inc.", "OpenStack Nova", "2014.1.2-1.el6")).to eq("openstack")
+    end
+  end
+
   describe "When running on RHEV Hypervisor" do
     it "returns 'kvm'" do
       expect(mixin.guest_from_dmi_data("Red Hat", "RHEV Hypervisor", "6.7-20150911.0.el6ev")).to eq("kvm")

data/spec/unit/plugins/abort_spec.rb

@@ -38,13 +38,13 @@ describe "a plug-in that aborts execution" do
 
   end
 
-  before(:each) do
+  before do
     fail_file = File.open("#{tmp}/plugins/abort.rb", "w+")
     fail_file.write(abortstr)
     fail_file.close
   end
 
-  after(:each) do
+  after do
     File.delete("#{tmp}/plugins/abort.rb")
   end
 
@@ -56,13 +56,13 @@ describe "a plug-in that aborts execution" do
 
   end
 
-  before(:each) do
+  before do
     @ohai = Ohai::System.new
     @loader = Ohai::Loader.new(@ohai)
     @runner = Ohai::Runner.new(@ohai)
   end
 
-  it "should raise SystemExit" do
+  it "raises SystemExit" do
     @plugin = @loader.load_plugin("#{tmp}/plugins/abort.rb")
     expect { @runner.run_plugin(@plugin) }.to raise_error(SystemExit)
   end

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

@@ -19,7 +19,7 @@
 require "spec_helper"
 
 describe Ohai::System, "AIX cpu plugin" do
-  before(:each) do
+  before do
     @lsdev_cc_processor = <<~LSDEV_CC_PROCESSOR
       proc0 Available 00-00 Processor
       proc4 Defined   00-04 Processor

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

@@ -19,7 +19,7 @@
 require "spec_helper"
 
 describe Ohai::System, "AIX filesystem plugin" do
-  before(:each) do
+  before do
     @df_pk_lpar = <<~DF_PK
       Filesystem    1024-blocks      Used Available Capacity Mounted on
       /dev/hd4          2097152    219796   1877356      11% /

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

@@ -19,7 +19,7 @@
 require "spec_helper"
 
 describe Ohai::System, "AIX hostname plugin" do
-  before(:each) do
+  before do
     @plugin = get_plugin("hostname")
     allow(@plugin).to receive(:collect_os).and_return(:aix)
     allow(@plugin).to receive(:from_cmd).with("hostname -s").and_return("aix_admin")
@@ -27,7 +27,7 @@ describe Ohai::System, "AIX hostname plugin" do
     @plugin.run
   end
 
-  it "should set the machinename" do
+  it "sets the machinename" do
     expect(@plugin[:machinename]).to eql("aix_admin")
   end
 end

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

@@ -19,7 +19,7 @@
 require "spec_helper"
 
 describe Ohai::System, "AIX kernel plugin" do
-  before(:each) do
+  before do
     @plugin = get_plugin("aix/kernel")
     allow(@plugin).to receive(:collect_os).and_return(:aix)
     allow(@plugin).to receive(:shell_out).with("uname -s").and_return(mock_shell_out(0, "AIX", nil))

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

@@ -19,7 +19,7 @@
 require "spec_helper"
 
 describe Ohai::System, "AIX memory plugin" do
-  before(:each) do
+  before do
     @plugin = get_plugin("aix/memory")
     allow(@plugin).to receive(:collect_os).and_return(:aix)
     allow(@plugin).to receive(:shell_out).with("svmon -G -O unit=MB,summary=longreal | grep '[0-9]'").and_return(mock_shell_out(0, " 513280.00 340034.17 173245.83   62535.17 230400.05 276950.14  70176.00\n", nil))
@@ -27,22 +27,22 @@ describe Ohai::System, "AIX memory plugin" do
     allow(@plugin).to receive(:shell_out).with("swap -s").and_return(mock_shell_out(0, @swap_s, nil))
   end
 
-  it "should get total memory" do
+  it "gets total memory" do
     @plugin.run
     expect(@plugin["memory"]["total"]).to eql("#{513280 * 1024}kB")
   end
 
-  it "should get free memory" do
+  it "gets free memory" do
     @plugin.run
     expect(@plugin["memory"]["free"]).to eql("#{173245.83.to_i * 1024}kB")
   end
 
-  it "should get total swap" do
+  it "gets total swap" do
     @plugin.run
     expect(@plugin["memory"]["swap"]["total"]).to eql( "#{23887872 * 4}kB")
   end
 
-  it "should get free swap" do
+  it "gets free swap" do
     @plugin.run
     expect(@plugin["memory"]["swap"]["free"]).to eql( "#{23598960 * 4}kB")
   end

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

@@ -20,7 +20,7 @@ require "spec_helper"
 
 describe Ohai::System, "AIX network plugin" do
 
-  before(:each) do
+  before do
     @netstat_rn_grep_default = <<~NETSTAT_RN_GREP_DEFAULT
       default            172.31.8.1        UG        2    121789 en0      -      -
     NETSTAT_RN_GREP_DEFAULT
@@ -232,6 +232,7 @@ describe Ohai::System, "AIX network plugin" do
         @plugin.run
         @inet_interface_addresses = @plugin["network"]["interfaces"]["en0"][:addresses]["BE:42:80:00:B0:05"]
       end
+
       it "detects the family" do
         expect(@inet_interface_addresses[:family]).to eq("lladdr")
       end
@@ -286,6 +287,7 @@ describe Ohai::System, "AIX network plugin" do
     before do
       @plugin.run
     end
+
     it "supresses the hostname entries" do
       expect(@plugin["network"]["arp"][0][:remote_host]).to eq("?")
     end
@@ -303,6 +305,7 @@ describe Ohai::System, "AIX network plugin" do
     before do
       @plugin.run
     end
+
     it "converts a netmask from hexadecimal form to decimal form" do
       expect(@plugin.hex_to_dec_netmask("0xffff0000")).to eq("255.255.0.0")
     end

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

@@ -19,7 +19,7 @@
 require "spec_helper"
 
 describe Ohai::System, "Aix plugin platform" do
-  before(:each) do
+  before do
     @plugin = get_plugin("aix/platform")
     allow(@plugin).to receive(:collect_os).and_return(:aix)
     kernel = Mash.new
@@ -30,15 +30,15 @@ describe Ohai::System, "Aix plugin platform" do
     @plugin.run
   end
 
-  it "should set platform to aix" do
+  it "sets platform to aix" do
     expect(@plugin[:platform]).to eq("aix")
   end
 
-  it "should set the platform_version" do
+  it "sets the platform_version" do
     expect(@plugin[:platform_version]).to eq("7.1")
   end
 
-  it "should set platform_family" do
+  it "sets platform_family" do
     expect(@plugin[:platform_family]).to eq(@plugin[:platform])
   end
 end

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

@@ -20,20 +20,20 @@ require "spec_helper"
 
 describe Ohai::System, "Aix plugin uptime" do
 
-  before(:each) do
+  before do
     @plugin = get_plugin("aix/uptime")
     allow(@plugin).to receive(:collect_os).and_return(:aix)
     allow(@plugin).to receive(:shell_out).and_call_original
   end
 
-  it "should set uptime_seconds and uptime standard case" do
+  it "sets uptime_seconds and uptime standard case" do
     allow(@plugin).to receive(:shell_out).with("LC_ALL=POSIX ps -o etime= -p 1").and_return(mock_shell_out(0, "1148-20:54:50", nil))
     @plugin.run
     expect(@plugin[:uptime_seconds]).to eq(99262490)
     expect(@plugin[:uptime]).to eq("1148 days 20 hours 54 minutes 50 seconds")
   end
 
-  it "should set uptime_seconds and uptime in the whitespace case" do
+  it "sets uptime_seconds and uptime in the whitespace case" do
     allow(@plugin).to receive(:shell_out).with("LC_ALL=POSIX ps -o etime= -p 1").and_return(mock_shell_out(0, " 2-20:54:50", nil))
     @plugin.run
     expect(@plugin[:uptime_seconds]).to eq(248090)

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

@@ -31,7 +31,7 @@ describe Ohai::System, "AIX virtualization plugin" do
       p
     end
 
-    before(:each) do
+    before do
       @lswpar_l = <<~LSWPAR_L
         =================================================================
         applejack-541ba3 - Active

data/spec/unit/plugins/azure_spec.rb

@@ -74,7 +74,7 @@ describe Ohai::System, "plugin azure" do
   end
 
   describe "with azure hint file" do
-    before(:each) do
+    before do
       allow(plugin).to receive(:hint?).with("azure").and_return(hint)
     end
 
@@ -90,7 +90,7 @@ describe Ohai::System, "plugin azure" do
   end
 
   describe "without azure hint file or agent or dhcp options" do
-    before(:each) do
+    before do
       allow(plugin).to receive(:hint?).with("azure").and_return(false)
       allow(File).to receive(:exist?).with("/usr/sbin/waagent").and_return(false)
       allow(Dir).to receive(:exist?).with('C:\WindowsAzure').and_return(false)
@@ -123,7 +123,7 @@ describe Ohai::System, "plugin azure" do
   end
 
   describe "with rackspace hint file, no agent, and no dhcp lease" do
-    before(:each) do
+    before do
       allow(plugin).to receive(:hint?).with("rackspace").and_return(true)
       allow(plugin).to receive(:hint?).with("azure").and_return(false)
       allow(File).to receive(:exist?).with("/usr/sbin/waagent").and_return(false)
@@ -135,7 +135,7 @@ describe Ohai::System, "plugin azure" do
   end
 
   describe "without azure hint file but with agent on linux" do
-    before(:each) do
+    before do
       allow(plugin).to receive(:hint?).with("azure").and_return(false)
       allow(File).to receive(:exist?).with("/usr/sbin/waagent").and_return(true)
       allow(Dir).to receive(:exist?).with('C:\WindowsAzure').and_return(false)
@@ -145,7 +145,7 @@ describe Ohai::System, "plugin azure" do
   end
 
   describe "without azure hint file but with agent on windows" do
-    before(:each) do
+    before do
       allow(plugin).to receive(:hint?).with("azure").and_return(false)
       allow(File).to receive(:exist?).with("/usr/sbin/waagent").and_return(false)
       allow(Dir).to receive(:exist?).with('C:\WindowsAzure').and_return(true)
@@ -155,7 +155,7 @@ describe Ohai::System, "plugin azure" do
   end
 
   describe "without azure hint or agent but with dhcp option" do
-    before(:each) do
+    before do
       allow(plugin).to receive(:hint?).with("azure").and_return(false)
       allow(File).to receive(:exist?).with("/usr/sbin/waagent").and_return(false)
       allow(Dir).to receive(:exist?).with('C:\WindowsAzure').and_return(false)
@@ -188,7 +188,7 @@ describe Ohai::System, "plugin azure" do
   end
 
   describe "with non-responsive metadata endpoint" do
-    before(:each) do
+    before do
       allow(plugin).to receive(:hint?).with("azure").and_return({})
     end
 
@@ -205,7 +205,7 @@ describe Ohai::System, "plugin azure" do
   end
 
   describe "with responsive metadata endpoint" do
-    before(:each) do
+    before do
       allow(plugin).to receive(:hint?).with("azure").and_return({})
       allow(plugin).to receive(:can_socket_connect?)
         .with(Ohai::Mixin::AzureMetadata::AZURE_METADATA_ADDR, 80)

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

@@ -21,7 +21,8 @@ require "spec_helper"
 
 describe Ohai::System, "BSD filesystem plugin" do
   let(:plugin) { get_plugin("filesystem") }
-  before(:each) do
+
+  before do
     allow(plugin).to receive(:collect_os).and_return(:freebsd)
 
     allow(plugin).to receive(:shell_out).with("df").and_return(mock_shell_out(0, "", ""))
@@ -30,7 +31,7 @@ describe Ohai::System, "BSD filesystem plugin" do
   end
 
   describe "when gathering filesystem usage data from df" do
-    before(:each) do
+    before do
       @stdout = <<~DF
         Filesystem  1K-blocks    Used   Avail Capacity  Mounted on
         /dev/ada0p2   9637788 3313504 5553264    37%    /
@@ -46,55 +47,55 @@ describe Ohai::System, "BSD 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 and df -iP" do
+    it "runs df and df -iP" do
       expect(plugin).to receive(:shell_out).ordered.with("df").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" do
+    it "sets kb_size to value from df" do
       plugin.run
       expect(plugin[:filesystem]["/dev/ada0p2"][:kb_size]).to eq("9637788")
       expect(plugin[:filesystem2]["by_pair"]["/dev/ada0p2,/"][:kb_size]).to eq("9637788")
     end
 
-    it "should set kb_used to value from df" do
+    it "sets kb_used to value from df" do
       plugin.run
       expect(plugin[:filesystem]["/dev/ada0p2"][:kb_used]).to eq("3313504")
       expect(plugin[:filesystem2]["by_pair"]["/dev/ada0p2,/"][:kb_used]).to eq("3313504")
     end
 
-    it "should set kb_available to value from df" do
+    it "sets kb_available to value from df" do
       plugin.run
       expect(plugin[:filesystem]["/dev/ada0p2"][:kb_available]).to eq("5553264")
       expect(plugin[:filesystem2]["by_pair"]["/dev/ada0p2,/"][:kb_available]).to eq("5553264")
     end
 
-    it "should set percent_used to value from df" do
+    it "sets percent_used to value from df" do
       plugin.run
       expect(plugin[:filesystem]["/dev/ada0p2"][:percent_used]).to eq("37%")
       expect(plugin[:filesystem2]["by_pair"]["/dev/ada0p2,/"][:percent_used]).to eq("37%")
     end
 
-    it "should set mount to value from df" do
+    it "sets mount to value from df" do
       plugin.run
       expect(plugin[:filesystem]["/dev/ada0p2"][:mount]).to eq("/")
       expect(plugin[:filesystem2]["by_pair"]["/dev/ada0p2,/"][:mount]).to eq("/")
     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]["/dev/ada0p2"][:total_inodes]).to eq("1043326")
       expect(plugin[:filesystem2]["by_pair"]["/dev/ada0p2,/"][:total_inodes]).to eq("1043326")
     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]["/dev/ada0p2"][:inodes_used]).to eq("252576")
       expect(plugin[:filesystem2]["by_pair"]["/dev/ada0p2,/"][:inodes_used]).to eq("252576")
     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]["/dev/ada0p2"][:inodes_available]).to eq("790750")
       expect(plugin[:filesystem2]["by_pair"]["/dev/ada0p2,/"][:inodes_available]).to eq("790750")
@@ -102,7 +103,7 @@ describe Ohai::System, "BSD filesystem plugin" do
   end
 
   describe "when gathering mounted filesystem data from mount" do
-    before(:each) do
+    before do
       @stdout = <<~MOUNT
         /dev/ada0p2 on / (ufs, local, journaled soft-updates)
         devfs on /dev (devfs, local, multilabel)
@@ -110,24 +111,24 @@ describe Ohai::System, "BSD filesystem plugin" do
       allow(plugin).to receive(:shell_out).with("mount -l").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 -l").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]["/dev/ada0p2"][:mount]).to eq("/")
       expect(plugin[:filesystem2]["by_pair"]["/dev/ada0p2,/"][:mount]).to eq("/")
     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]["/dev/ada0p2"][:fs_type]).to eq("ufs")
       expect(plugin[:filesystem2]["by_pair"]["/dev/ada0p2,/"][:fs_type]).to eq("ufs")
     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]["/dev/ada0p2"][:mount_options]).to eq(["local", "journaled soft-updates"])
       expect(plugin[:filesystem2]["by_pair"]["/dev/ada0p2,/"][:mount_options]).to eq(["local", "journaled soft-updates"])