ohai 13.12.6 → 14.0.28

data/spec/unit/plugins/root_group_spec.rb

@@ -79,7 +79,7 @@ describe Ohai::System, "root_group" do
 
   describe "windows platform" do
     it "should return the group administrators" do
-      stub_const("::RbConfig::CONFIG", { "host_os" => "windows" } )
+      allow(@plugin).to receive(:collect_os).and_return(:windows)
       expect(Ohai::Util::Win32::GroupHelper).to receive(:windows_root_group_name).and_return("administrators")
       @plugin.run
       expect(@plugin[:root_group]).to eq("administrators")

data/spec/unit/plugins/ruby_spec.rb

@@ -49,7 +49,7 @@ describe Ohai::System, "plugin ruby" do
     :gems_dir => `#{ruby_bin} #{::RbConfig::CONFIG["bindir"]}/gem env gemdir`.chomp,
     :gem_bin => [ ::Gem.default_exec_format % "gem", "gem" ].map do |bin|
       "#{::RbConfig::CONFIG['bindir']}/#{bin}"
-    end.find { |bin| ::File.exists? bin },
+    end.find { |bin| ::File.exist? bin },
     :ruby_bin => ruby_bin,
   }.each do |attribute, value|
     it "should have #{attribute} set to #{value.inspect}" do

data/spec/unit/plugins/rust_spec.rb

@@ -18,7 +18,7 @@ require_relative "../../spec_helper.rb"
 
 describe Ohai::System, "plugin rust" do
   let(:stdout) { "rustc 1.0.0-nightly (29bd9a06e 2015-01-20 23:03:09 +0000)" }
-  let (:plugin) do
+  let(:plugin) do
     plugin = get_plugin("rust")
     plugin[:languages] = Mash.new
     allow(plugin).to receive(:shell_out).with("rustc --version").and_return(mock_shell_out(0, stdout, ""))

data/spec/unit/plugins/scala_spec.rb

@@ -20,7 +20,7 @@ require_relative "../../spec_helper.rb"
 describe Ohai::System, "plugin scala" do
 
   let(:plugin) do
-    plugin = get_plugin("scala").tap do |plugin|
+    get_plugin("scala").tap do |plugin|
       plugin[:languages] = Mash.new
     end
   end

data/spec/unit/plugins/scaleway_spec.rb

@@ -0,0 +1,91 @@
+#
+# Author:: Jonathan Amiez (<jonathan.amiez@gmail.com>)
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "spec_helper"
+
+describe Ohai::System, "plugin scaleway" do
+  let(:plugin) { get_plugin("scaleway") }
+
+  before(:each) 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
+      expect(plugin).not_to receive(:http_client)
+      expect(plugin[:scaleway]).to be_nil
+      plugin.run
+    end
+  end
+
+  shared_examples_for "scaleway" do
+    before(:each) 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], []])
+      t = double("connection")
+      allow(t).to receive(:connect_nonblock).and_raise(Errno::EINPROGRESS)
+      allow(Socket).to receive(:new).and_return(t)
+      allow(Socket).to receive(:pack_sockaddr_in).and_return(nil)
+    end
+
+    let(:body) 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
+      expect(@http_client).to receive(:get).
+        with("/conf?format=json").
+        and_return(double("Net::HTTP Response", :body => body, :code => "200"))
+      plugin.run
+
+      expect(plugin[:scaleway]).not_to be_nil
+      expect(plugin[:scaleway]["id"]).to eq("77fab916-e7ff-44c6-a025-ae08837b4c4f")
+      expect(plugin[:scaleway]["hostname"]).to eq("sample-hostname")
+    end
+
+    it "should complete 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"))
+      plugin.run
+
+      expect(plugin[:scaleway]).not_to be_nil
+    end
+  end
+
+  describe "without hint or cmdline" do
+    it_should_behave_like "!scaleway"
+  end
+
+  describe "with scaleway hint file" do
+    it_should_behave_like "scaleway"
+
+    before(:each) do
+      allow(plugin).to receive(:hint?).with("scaleway").and_return(true)
+    end
+  end
+
+  describe "with scaleway cmdline" do
+    it_should_behave_like "scaleway"
+
+    before(:each) 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
+  end
+end

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

@@ -455,15 +455,15 @@ END
     end
 
     it "should get the number of threads per core" do
-      expect(@plugin["cpu"]["corethreads"]).to eql (2)
+      expect(@plugin["cpu"]["corethreads"]).to eql(2)
     end
 
     it "should get the total number of online cores" do
-      expect(@plugin["cpu"]["cpustates"]["on-line"]).to eql (8)
+      expect(@plugin["cpu"]["cpustates"]["on-line"]).to eql(8)
     end
 
     it "should get the total number of offline cores" do
-      expect(@plugin["cpu"]["cpustates"]["off-line"]).to eql (8)
+      expect(@plugin["cpu"]["cpustates"]["off-line"]).to eql(8)
     end
 
     describe "per-cpu information" do

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

@@ -41,7 +41,7 @@ Origin# = 1
 NumCPU = 16
 UNAME_X
 
-      allow(File).to receive(:exists?).with("/sbin/uname").and_return(true)
+      allow(File).to receive(:exist?).with("/sbin/uname").and_return(true)
       allow(@plugin).to receive(:shell_out).with("/sbin/uname -X").and_return(mock_shell_out(0, @uname_x, ""))
 
       @release = StringIO.new("  SmartOS 20120130T201844Z x86_64\n")
@@ -81,7 +81,7 @@ Origin# = 1
 NumCPU = 1
 UNAME_X
 
-      allow(File).to receive(:exists?).with("/sbin/uname").and_return(true)
+      allow(File).to receive(:exist?).with("/sbin/uname").and_return(true)
       allow(@plugin).to receive(:shell_out).with("/sbin/uname -X").and_return(mock_shell_out(0, @uname_x, ""))
 
       @release = StringIO.new("                             Oracle Solaris 11.1 X86\n")

data/spec/unit/plugins/ssh_host_keys_spec.rb

@@ -24,13 +24,13 @@ describe Ohai::System, "ssh_host_key plugin" do
     @plugin = get_plugin("ssh_host_key")
     @plugin[:keys] = Mash.new
 
-    allow(File).to receive(:exists?).with("/etc/ssh/sshd_config").and_return(true)
+    allow(File).to receive(:exist?).with("/etc/ssh/sshd_config").and_return(true)
     allow(File).to receive(:open).with("/etc/ssh/sshd_config").and_yield(sshd_config_file)
-    allow(File).to receive(:exists?).and_return(true)
-    allow(File).to receive(:exists?).with("/etc/ssh/ssh_host_dsa_key.pub").and_return(true)
-    allow(File).to receive(:exists?).with("/etc/ssh/ssh_host_rsa_key.pub").and_return(true)
-    allow(File).to receive(:exists?).with("/etc/ssh/ssh_host_ecdsa_key.pub").and_return(true)
-    allow(File).to receive(:exists?).with("/etc/ssh/ssh_host_ed25519_key.pub").and_return(true)
+    allow(File).to receive(:exist?).and_return(true)
+    allow(File).to receive(:exist?).with("/etc/ssh/ssh_host_dsa_key.pub").and_return(true)
+    allow(File).to receive(:exist?).with("/etc/ssh/ssh_host_rsa_key.pub").and_return(true)
+    allow(File).to receive(:exist?).with("/etc/ssh/ssh_host_ecdsa_key.pub").and_return(true)
+    allow(File).to receive(:exist?).with("/etc/ssh/ssh_host_ed25519_key.pub").and_return(true)
 
     # Ensure we can still use IO.read
     io_read = IO.method(:read)
@@ -104,8 +104,8 @@ EOS
       nil
     end
     before do
-      allow(File).to receive(:exists?).with("/etc/ssh/sshd_config").and_return(false)
-      allow(File).to receive(:exists?).with("/etc/sshd_config").and_return(false)
+      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)
     end
 
     it_behaves_like "loads keys"

data/spec/unit/plugins/sysconf_spec.rb

@@ -346,6 +346,7 @@ _POSIX_RAW_SOCKETS                 200809
 GETCONF_OUT
     allow(plugin).to receive(:which).with("getconf").and_return("/usr/bin/getconf")
     allow(plugin).to receive(:shell_out).with("/usr/bin/getconf -a").and_return(mock_shell_out(0, getconf_out, ""))
+    allow(plugin).to receive(:collect_os).and_return(:linux)
     plugin.run
     expect(plugin[:sysconf].to_hash).to eq({
       "LINK_MAX" => 65000,

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

@@ -0,0 +1,79 @@
+#
+# Copyright:: Copyright (c) 2018 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require_relative "../../../spec_helper.rb"
+
+describe Ohai::System, "Windows kernel plugin", :windows_only do
+  let(:plugin) { get_plugin("kernel") }
+
+  before do
+    require "wmi-lite/wmi"
+
+    # Mock a Win32_OperatingSystem OLE32 WMI object
+    caption = double("WIN32OLE", :name => "Caption")
+    version = double("WIN32OLE", :name => "Version")
+    build_number = double("WIN32OLE", :name => "BuildNumber")
+    csd_version  = double("WIN32OLE", :name => "CsdVersion")
+    os_type = double("WIN32OLE", :name => "OsType")
+    product_type = double("WIN32OLE", :name => "ProductType")
+    operating_system_sku = double("WIN32OLE", :name => "OperatingSystemSKU")
+    os_properties = [ caption, version, build_number, csd_version, os_type, product_type, operating_system_sku ]
+
+    os = double( "WIN32OLE",
+                  :properties_ => os_properties)
+
+    allow(os).to receive(:invoke).with(build_number.name).and_return("7601")
+    allow(os).to receive(:invoke).with(csd_version.name).and_return("Service Pack 1")
+    allow(os).to receive(:invoke).with(os_type.name).and_return(18)
+    allow(os).to receive(:invoke).with(caption.name).and_return("Microsoft Windows 7 Ultimate")
+    allow(os).to receive(:invoke).with(version.name).and_return("6.1.7601")
+    allow(os).to receive(:invoke).with(product_type.name).and_return(1)
+    allow(os).to receive(:invoke).with(operating_system_sku.name).and_return(48)
+
+    os_wmi = WmiLite::Wmi::Instance.new(os)
+    expect_any_instance_of(WmiLite::Wmi).to receive(:first_of).with("Win32_OperatingSystem").and_return(os_wmi)
+
+    system_type = double("WIN32OLE", :name => "SystemType")
+    pc_system_type = double("WIN32OLE", :name => "PCSystemType")
+    free_virtual_memory = double("WIN32OLE", :name => "FreeVirtualMemory")
+    cs_properties = [ system_type, pc_system_type, free_virtual_memory]
+
+    cs = double("WIN32OLE",
+                :properties_ => cs_properties)
+
+    allow(cs).to receive(:invoke).with(system_type.name).and_return("x64-based PC")
+    allow(cs).to receive(:invoke).with(pc_system_type.name).and_return(2)
+    allow(cs).to receive(:invoke).with(free_virtual_memory.name).and_return("Why would you want this data here?")
+
+    cs_wmi = WmiLite::Wmi::Instance.new(cs)
+    expect_any_instance_of(WmiLite::Wmi).to receive(:first_of).with("Win32_ComputerSystem").and_return(cs_wmi)
+
+    plugin.run
+  end
+
+  it "should set the correct system information" do
+    expect(plugin[:kernel][:name]).to eq("Microsoft Windows 7 Ultimate")
+    expect(plugin[:kernel][:release]).to eq("6.1.7601")
+    expect(plugin[:kernel][:version]).to eq("6.1.7601 Service Pack 1 Build 7601")
+    expect(plugin[:kernel][:os]).to eq("WINNT")
+    expect(plugin[:kernel][:machine]).to eq("x86_64")
+    expect(plugin[:kernel][:system_type]).to eq("Mobile")
+    expect(plugin[:kernel][:product_type]).to eq("Workstation")
+    expect(plugin[:kernel][:server_core]).to eq(false)
+    expect(plugin[:kernel]).not_to have_key(:free_virtual_memory)
+  end
+end

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

@@ -20,69 +20,19 @@ require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "Windows plugin uptime" do
 
+  let(:plugin) { get_plugin("uptime") }
   let(:wmi) { double("wmi", { :first_of => "" }) }
 
   before(:each) do
     allow(WmiLite::Wmi).to receive(:new).and_return(wmi)
+    allow(plugin).to receive(:collect_os).and_return(:windows)
   end
 
-  ## Windows newer versions category here includes server OS starting from Windows Server 2008 ##
-  shared_context "WMI class for newer versions of Windows platform" do
-    before do
-      allow(uptime_plugin).to receive(:collect_os).and_return(:windows)
-    end
-
-    it "uses Win32_OperatingSystem WMI class to fetch the system's uptime" do
-      expect(wmi).to receive(:first_of).with("Win32_OperatingSystem")
-      expect(Time).to receive(:new)
-      expect(Time).to receive(:parse)
-      expect(uptime_plugin).to receive(:seconds_to_human)
-      uptime_plugin.run
-    end
-  end
-
-  ## Windows older versions category here includes server OS starting from Windows Server 2003 ##
-  shared_context "WMI class for older versions of Windows platform" do
-    before do
-      allow(uptime_plugin).to receive(:collect_os).and_return(:windows)
-    end
-
-    it "uses Win32_PerfFormattedData_PerfOS_System WMI class to fetch the system's uptime" do
-      expect(wmi).to receive(:first_of).with("Win32_PerfFormattedData_PerfOS_System")
-      expect(Time).to_not receive(:new)
-      expect(Time).to_not receive(:parse)
-      expect(uptime_plugin).to receive(:seconds_to_human)
-      uptime_plugin.run
-    end
-  end
-
-  context "platform is Windows Server 2008 R2" do
-    let(:uptime_plugin) do
-      get_plugin("uptime").tap do |plugin|
-        plugin[:platform_version] = "6.1.7601"
-      end
-    end
-
-    include_context "WMI class for newer versions of Windows platform"
-  end
-
-  context "platform is Windows Server 2003 R2" do
-    let(:uptime_plugin) do
-      get_plugin("uptime").tap do |plugin|
-        plugin[:platform_version] = "5.2.3790"
-      end
-    end
-
-    include_context "WMI class for older versions of Windows platform"
-  end
-
-  context "platform is Windows Server 2012" do
-    let(:uptime_plugin) do
-      get_plugin("uptime").tap do |plugin|
-        plugin[:platform_version] = "6.2.9200"
-      end
-    end
-
-    include_context "WMI class for newer versions of Windows platform"
+  it "uses Win32_OperatingSystem WMI class to fetch the system's uptime" do
+    expect(wmi).to receive(:first_of).with("Win32_OperatingSystem")
+    expect(Time).to receive(:new)
+    expect(Time).to receive(:parse)
+    expect(plugin).to receive(:seconds_to_human)
+    plugin.run
   end
 end

data/spec/unit/provides_map_spec.rb

@@ -23,10 +23,10 @@ describe Ohai::ProvidesMap do
 
   let(:ohai_system) { Ohai::System.new }
   let(:provides_map) { Ohai::ProvidesMap.new }
-  let(:plugin_1) { Ohai::DSL::Plugin.new(ohai_system.data) }
-  let(:plugin_2) { Ohai::DSL::Plugin.new(ohai_system.data) }
-  let(:plugin_3) { Ohai::DSL::Plugin.new(ohai_system.data) }
-  let(:plugin_4) { Ohai::DSL::Plugin.new(ohai_system.data) }
+  let(:plugin_1) { Ohai::DSL::Plugin.new(ohai_system.data, ohai_system.logger) }
+  let(:plugin_2) { Ohai::DSL::Plugin.new(ohai_system.data, ohai_system.logger) }
+  let(:plugin_3) { Ohai::DSL::Plugin.new(ohai_system.data, ohai_system.logger) }
+  let(:plugin_4) { Ohai::DSL::Plugin.new(ohai_system.data, ohai_system.logger) }
 
   describe "when looking up providing plugins for a single attribute" do
     describe "when the attribute does not exist" do

data/spec/unit/runner_spec.rb

@@ -54,43 +54,6 @@ describe Ohai::Runner, "run_plugin" do
       end
     end
 
-    describe "version 6" do
-      let(:version) { :version6 }
-
-      it "should call run_v6_plugin" do
-        expect(@runner).to receive(:run_v6_plugin)
-        @runner.run_plugin(plugin)
-      end
-
-      describe "if the plugin has not run before" do
-        describe "if safe_run is not set" do
-          it "safe_run should be called" do
-            expect(plugin).to receive(:safe_run)
-            @runner.run_plugin(plugin)
-          end
-        end
-
-        describe "if safe_run is set" do
-          let(:safe_run) { false }
-
-          it "run should be called" do
-            expect(plugin).to receive(:run)
-            @runner.run_plugin(plugin)
-          end
-        end
-      end
-
-      describe "if the plugin has run before" do
-        let(:has_run) { true }
-
-        it "should not run" do
-          expect(plugin).not_to receive(:safe_run)
-          @runner.run_plugin(plugin)
-        end
-
-      end
-    end
-
     describe "invalid version" do
       let(:version) { :versionBla }
 
@@ -108,7 +71,7 @@ describe Ohai::Runner, "run_plugin" do
           thing(Mash.new)
         end
       end
-      klass.new(@ohai.data)
+      klass.new(@ohai.data, @ohai.logger)
     end
 
     it "should run the plugin" do
@@ -133,7 +96,7 @@ describe Ohai::Runner, "run_plugin" do
             thing(other_thing)
           end
         end
-        @plugin = klass.new(@ohai.data)
+        @plugin = klass.new(@ohai.data, @ohai.logger)
       end
 
       it "should raise Ohai::Excpetions::AttributeNotFound" do
@@ -164,7 +127,7 @@ describe Ohai::Runner, "run_plugin" do
 
         @plugins = []
         [klass1, klass2].each do |klass|
-          @plugins << klass.new(@ohai.data)
+          @plugins << klass.new(@ohai.data, @ohai.logger)
         end
         @plugin1, @plugin2 = @plugins
 
@@ -197,7 +160,7 @@ describe Ohai::Runner, "run_plugin" do
 
         @plugins = []
         [klass1, klass1, klass2].each do |klass|
-          @plugins << klass.new(@ohai.data)
+          @plugins << klass.new(@ohai.data, @ohai.logger)
         end
         @plugin1, @plugin2, @plugin3 = @plugins
 
@@ -241,7 +204,7 @@ describe Ohai::Runner, "run_plugin" do
 
       @plugins = []
       [klass1, klass2, klass3].each do |klass|
-        @plugins << klass.new(@ohai.data)
+        @plugins << klass.new(@ohai.data, @ohai.logger)
       end
       @plugin1, @plugin2, @plugin3 = @plugins
       @ohai.provides_map.set_providers_for(@plugin1, %w{one two})
@@ -261,7 +224,7 @@ describe Ohai::Runner, "run_plugin" do
 
     context "when there are no edges in the cycle (A->A)" do
       let(:plugin_class) do
-        klass1 = Ohai.plugin(:Thing) do
+        Ohai.plugin(:Thing) do
           provides("thing")
           depends("thing")
           collect_data do
@@ -269,12 +232,10 @@ describe Ohai::Runner, "run_plugin" do
           end
         end
       end
-      let(:plugin) { plugin_class.new(@ohai.data) }
+      let(:plugin) { plugin_class.new(@ohai.data, @ohai.logger) }
 
       it "ignores the cycle" do
         @ohai.provides_map.set_providers_for(plugin, ["thing"])
-
-        expected_error_string = "Dependency cycle detected. Please refer to the following plugins: Thing, Other"
         runner.run_plugin(plugin) # should not raise
       end
 
@@ -282,7 +243,7 @@ describe Ohai::Runner, "run_plugin" do
 
     context "when there is one edge in the cycle (A->B and B->A)" do
       before(:each) do
-        klass1 = Ohai.plugin(:Thing) do
+        klass1 = Ohai.plugin(:Thing) do # rubocop disable Lint/UselessAssignment
           provides("thing")
           depends("other")
           collect_data do
@@ -299,7 +260,7 @@ describe Ohai::Runner, "run_plugin" do
 
         @plugins = []
         [klass1, klass2].each_with_index do |klass, idx|
-          @plugins << klass.new(@ohai.data)
+          @plugins << klass.new(@ohai.data, @ohai.logger)
         end
 
         @plugin1, @plugin2 = @plugins
@@ -336,7 +297,7 @@ describe Ohai::Runner, "run_plugin" do
 
       @plugins = []
       [klass_a, klass_b, klass_c].each do |klass|
-        @plugins << klass.new(@ohai.data)
+        @plugins << klass.new(@ohai.data, @ohai.logger)
       end
       @plugin_a, @plugin_b, @plugin_c = @plugins
     end
@@ -373,12 +334,12 @@ describe Ohai::Runner, "fetch_plugins" do
   before(:each) do
     @provides_map = Ohai::ProvidesMap.new
     @data = Mash.new
-    @ohai = double("Ohai::System", :data => @data, :provides_map => @provides_map)
+    @ohai = double("Ohai::System", :data => @data, :provides_map => @provides_map, logger: Ohai::Log.with_child)
     @runner = Ohai::Runner.new(@ohai, true)
   end
 
   it "should collect the provider" do
-    plugin = Ohai::DSL::Plugin.new(@ohai.data)
+    plugin = Ohai::DSL::Plugin.new(@ohai.data, @ohai.logger)
     @ohai.provides_map.set_providers_for(plugin, ["top/middle/bottom"])
 
     dependency_providers = @runner.fetch_plugins(["top/middle/bottom"])
@@ -388,7 +349,7 @@ describe Ohai::Runner, "fetch_plugins" do
   describe "when the attribute is not provided by any plugin" do
     describe "and some parent attribute has providers" do
       it "should return the providers for the parent" do
-        plugin = Ohai::DSL::Plugin.new(@ohai.data)
+        plugin = Ohai::DSL::Plugin.new(@ohai.data, @ohai.logger)
         @provides_map.set_providers_for(plugin, ["test/attribute"])
         expect(@runner.fetch_plugins(["test/attribute/too_far"])).to eql([plugin])
       end
@@ -403,7 +364,7 @@ describe Ohai::Runner, "fetch_plugins" do
   end
 
   it "should return unique providers" do
-    plugin = Ohai::DSL::Plugin.new(@ohai.data)
+    plugin = Ohai::DSL::Plugin.new(@ohai.data, @ohai.logger)
     @provides_map.set_providers_for(plugin, ["test", "test/too_far/way_too_far"])
     expect(@runner.fetch_plugins(["test", "test/too_far/way_too_far"])).to eql([plugin])
   end
@@ -438,7 +399,7 @@ describe Ohai::Runner, "#get_cycle" do
 
     plugins = []
     [klass1, klass2, klass3].each_with_index do |klass, idx|
-      plugins << klass.new(@ohai.data)
+      plugins << klass.new(@ohai.data, @ohai.logger)
     end
     @plugin1, @plugin2, @plugin3 = plugins
   end