ohai 13.12.6 → 14.0.28

data/spec/unit/plugins/dmi_spec.rb

@@ -101,16 +101,15 @@ Chassis Information
 EOS
 
 describe Ohai::System, "plugin dmi" do
-  let(:plugin) { get_plugin("dmi") }
-  let(:stdout) { DMI_OUT }
-
   before(:each) do
-    allow(plugin).to receive(:shell_out).with("dmidecode").and_return(mock_shell_out(0, stdout, ""))
+    @plugin = get_plugin("dmi")
+    @stdout = DMI_OUT
+    allow(@plugin).to receive(:shell_out).with("dmidecode").and_return(mock_shell_out(0, @stdout, ""))
   end
 
-  it "runs dmidecode" do
-    expect(plugin).to receive(:shell_out).with("dmidecode").and_return(mock_shell_out(0, stdout, ""))
-    plugin.run
+  it "should run dmidecode" do
+    expect(@plugin).to receive(:shell_out).with("dmidecode").and_return(mock_shell_out(0, @stdout, ""))
+    @plugin.run
   end
 
   # Test some simple sample data
@@ -129,28 +128,21 @@ describe Ohai::System, "plugin dmi" do
     },
   }.each do |id, data|
     data.each do |attribute, value|
-      it "attribute [:dmi][:#{id}][:#{attribute}] is set" do
-        plugin.run
-        expect(plugin[:dmi][id][attribute]).to eql(value)
+      it "should have [:dmi][:#{id}][:#{attribute}] set" do
+        @plugin.run
+        expect(@plugin[:dmi][id][attribute]).to eql(value)
       end
-      it "attribute [:dmi][:#{id}][:#{attribute}] set for windows output" do
-        stdout = convert_windows_output(DMI_OUT)
-        expect(plugin).to receive(:shell_out).with("dmidecode").and_return(mock_shell_out(0, stdout, ""))
-        plugin.run
-        expect(plugin[:dmi][id][attribute]).to eql(value)
+      it "should have [:dmi][:#{id}][:#{attribute}] set for windows output" do
+        @stdout = convert_windows_output(DMI_OUT)
+        expect(@plugin).to receive(:shell_out).with("dmidecode").and_return(mock_shell_out(0, @stdout, ""))
+        @plugin.run
+        expect(@plugin[:dmi][id][attribute]).to eql(value)
       end
     end
   end
 
-  it "allows capturing additional DMI data" do
-    Ohai.config[:additional_dmi_ids] = [ 16 ]
-    plugin.run
-    expect(plugin[:dmi]).to have_key(:physical_memory_array)
-  end
-
-  it "correctly ignores data in excluded DMI IDs" do
-    expect(plugin).to receive(:shell_out).with("dmidecode").and_return(mock_shell_out(0, stdout, ""))
-    plugin.run
-    expect(plugin[:dmi]).not_to have_key(:physical_memory_array)
+  it "should correctly ignore unwanted data" do
+    @plugin.run
+    expect(@plugin[:dmi][:base_board]).not_to have_key(:error_correction_type)
   end
 end

data/spec/unit/plugins/docker_spec.rb

@@ -0,0 +1,100 @@
+#
+# Copyright:: 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"
+
+docker_output = <<EOF
+{"ID":"KZET:VDFN:2V2G:JS5Z:HAKO:SOGI:AFSZ:HDMT:GVEM:V2NT:DUSW:J3Z6","Containers":11,"ContainersRunning":0,"ContainersPaused":0,"ContainersStopped":11,"Images":30,"Driver":"overlay2","DriverStatus":[["Backing Filesystem","extfs"],["Supports d_type","true"],["Native Overlay Diff","true"]],"SystemStatus":null,"Plugins":{"Volume":["local"],"Network":["bridge","host","ipvlan","macvlan","null","overlay"],"Authorization":null,"Log":["awslogs","fluentd","gcplogs","gelf","journald","json-file","logentries","splunk","syslog"]},"MemoryLimit":true,"SwapLimit":true,"KernelMemory":true,"CpuCfsPeriod":true,"CpuCfsQuota":true,"CPUShares":true,"CPUSet":true,"IPv4Forwarding":true,"BridgeNfIptables":true,"BridgeNfIp6tables":true,"Debug":true,"NFd":21,"OomKillDisable":true,"NGoroutines":39,"SystemTime":"2018-02-15T19:12:40.214106068Z","LoggingDriver":"json-file","CgroupDriver":"cgroupfs","NEventsListener":2,"KernelVersion":"4.9.60-linuxkit-aufs","OperatingSystem":"Docker for Mac","OSType":"linux","Architecture":"x86_64","IndexServerAddress":"https://index.docker.io/v1/","RegistryConfig":{"AllowNondistributableArtifactsCIDRs":[],"AllowNondistributableArtifactsHostnames":[],"InsecureRegistryCIDRs":["127.0.0.0/8"],"IndexConfigs":{"docker.io":{"Name":"docker.io","Mirrors":[],"Secure":true,"Official":true}},"Mirrors":[]},"NCPU":4,"MemTotal":2095816704,"GenericResources":null,"DockerRootDir":"/var/lib/docker","HttpProxy":"docker.for.mac.http.internal:3128","HttpsProxy":"docker.for.mac.http.internal:3129","NoProxy":"","Name":"linuxkit-025000000001","Labels":[],"ExperimentalBuild":true,"ServerVersion":"17.12.0-ce","ClusterStore":"","ClusterAdvertise":"","Runtimes":{"runc":{"path":"docker-runc"}},"DefaultRuntime":"runc","Swarm":{"NodeID":"","NodeAddr":"","LocalNodeState":"inactive","ControlAvailable":false,"Error":"","RemoteManagers":null},"LiveRestoreEnabled":false,"Isolation":"","InitBinary":"docker-init","ContainerdCommit":{"ID":"89623f28b87a6004d4b785663257362d1658a729","Expected":"89623f28b87a6004d4b785663257362d1658a729"},"RuncCommit":{"ID":"b2567b37d7b75eb4cf325b77297b140ea686ce8f","Expected":"b2567b37d7b75eb4cf325b77297b140ea686ce8f"},"InitCommit":{"ID":"949e6fa","Expected":"949e6fa"},"SecurityOptions":["name=seccomp,profile=default"]}
+EOF
+
+expected_output = {
+  "version_string" => "17.12.0-ce",
+  "version" => "17.12.0",
+  "runtimes" => {
+    "runc" => {
+      "path" => "docker-runc",
+    },
+  },
+  "root_dir" => "/var/lib/docker",
+  "containers" => {
+    "total" => 11,
+    "running" => 0,
+    "paused" => 0,
+    "stopped" => 11,
+  },
+  "plugins" => {
+    "Volume" => [
+      "local",
+    ],
+    "Network" => %w{
+bridge
+host
+ipvlan
+macvlan
+null
+overlay},
+    "Authorization" => nil,
+    "Log" => [
+      "awslogs",
+      "fluentd",
+      "gcplogs",
+      "gelf",
+      "journald",
+      "json-file",
+      "logentries",
+      "splunk",
+      "syslog",
+    ],
+  },
+  "networking" => {
+    "ipv4_forwarding" => true,
+    "bridge_nf_iptables" => true,
+    "bridge_nf_ipv6_iptables" => true,
+  },
+  "swarm" => {
+    "NodeID" => "",
+    "NodeAddr" => "",
+    "LocalNodeState" => "inactive",
+    "ControlAvailable" => false,
+    "Error" => "",
+    "RemoteManagers" => nil,
+  },
+}
+
+describe Ohai::System, "plugin docker" do
+  let(:plugin) { get_plugin("docker") }
+
+  context "if the machine does not have docker installed" do
+    it "should not create a docker attribute" do
+      plugin[:virtualization] = Mash.new
+      plugin[:virtualization][:systems] = Mash.new
+      plugin.run
+      expect(plugin).not_to have_key(:docker)
+    end
+  end
+
+  context "if the machine has docker installed" do
+    it "should create a docker attribute with correct data" do
+      plugin[:virtualization] = Mash.new
+      plugin[:virtualization][:systems] = Mash.new
+      plugin[:virtualization][:systems][:docker] = "host"
+      allow(plugin).to receive(:shell_out).with("docker info --format '{{json .}}'").and_return(mock_shell_out(0, docker_output, ""))
+      plugin.run
+      expect(plugin).to have_key(:docker)
+      expect(plugin[:docker]).to eq(expected_output)
+    end
+  end
+end

data/spec/unit/plugins/fail_spec.rb

@@ -59,13 +59,8 @@ shared_examples "a v7 loading failure" do
     expect { @ohai.provides_map.find_providers_for(["fail"]) }.to raise_error(Ohai::Exceptions::AttributeNotFound)
   end
 
-  it "should not have source key" do
-    @loader.load_plugin("#{tmp}/plugins/fail.rb")
-    expect(@ohai.v6_dependency_solver).not_to have_key("#{tmp}/plugins/fail.rb")
-  end
-
   it "should write to Ohai::Log" do
-    expect(Ohai::Log).to receive(:warn).once
+    expect(@loader.logger).to receive(:warn).once
     @loader.load_plugin("#{tmp}/plugins/fail.rb")
   end
 end
@@ -107,13 +102,8 @@ shared_examples "a v7 loading success" do
     expect(@ohai.provides_map).to have_key("fail")
   end
 
-  it "should have source key" do
-    @loader.load_plugin("#{tmp}/plugins/fail.rb")
-    expect(@ohai.v6_dependency_solver).to have_key("#{tmp}/plugins/fail.rb")
-  end
-
   it "should not write to Ohai::Log" do
-    expect(Ohai::Log).not_to receive(:warn)
+    expect(@loader.logger).not_to receive(:warn)
     @loader.load_plugin("#{tmp}/plugins/fail.rb")
   end
 end
@@ -156,56 +146,11 @@ shared_examples "a v7 run failure" do
   end
 
   it "should write to Ohai::Log" do
-    expect(Ohai::Log).to receive(:warn).once
+    expect(@loader.logger).to receive(:warn).once
     @loader.load_plugin("#{tmp}/plugins/fail.rb").new(@ohai).run
   end
 end
 
-=begin
-shared_examples "a v6 run failure" do
-  before(:all) do
-    begin
-      Dir.mkdir("#{tmp}/plugins")
-    rescue Errno::EEXIST
-      # ignore
-    end
-  end
-
-  before(:each) do
-    fail_file = File.open("#{tmp}/plugins/fail.rb", "w+")
-    fail_file.write(failstr)
-    fail_file.close
-  end
-
-  after(:each) do
-    File.delete("#{tmp}/plugins/fail.rb")
-  end
-
-  after(:all) do
-    begin
-      Dir.delete("#{tmp}/plugins")
-    rescue
-      # ignore
-    end
-  end
-
-  before(:each) do
-    @ohai = Ohai::System.new
-    @loader = Ohai::Loader.new(@ohai)
-  end
-
-  it "should not add data keys" do
-    @loader.load_plugin("#{tmp}/plugins/fail.rb")
-    @ohai.data.should_not have_key("fail")
-  end
-
-  it "should write to Ohai::Log" do
-    Ohai::Log.should_receive(:warn).once
-    @loader.load_plugin("#{tmp}/plugins/fail.rb").new(@ohai).run
-  end
-end
-=end
-
 describe "when using DSL commands outside Ohai.plugin block" do
   failstr1 = <<EOF
 provides "fail"

data/spec/unit/plugins/haskell_spec.rb

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

data/spec/unit/plugins/init_package_spec.rb

@@ -31,7 +31,7 @@ describe Ohai::System, "Init package" do
   let(:proc_1_file) { double(proc_1_file_path, :gets => proc1_content) }
 
   before(:each) do
-    allow(File).to receive(:exists?).with(proc_1_file_path).and_return(proc1_exists)
+    allow(File).to receive(:exist?).with(proc_1_file_path).and_return(proc1_exists)
     allow(File).to receive(:open).with(proc_1_file_path).and_return(proc_1_file)
   end
 

data/spec/unit/plugins/kernel_spec.rb

@@ -35,56 +35,4 @@ describe Ohai::System, "plugin kernel" do
   it_should_check_from_mash("kernel", "version", "uname -v", [0, "Darwin Kernel Version 9.5.0: Wed Sep  3 11:29:43 PDT 2008; root:xnu-1228.7.58~1\/RELEASE_I386\n", ""])
   it_should_check_from_mash("kernel", "machine", "uname -m", [0, "i386\n", ""])
   it_should_check_from_mash("kernel", "processor", "uname -p", [0, "i386\n", ""])
-
-  describe "when running on windows", :windows_only do
-    before do
-      require "wmi-lite/wmi"
-
-      @ohai_system = Ohai::System.new
-      @plugin = get_plugin("kernel", @ohai_system)
-
-      # 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")
-      os_properties = [ caption, version, build_number, csd_version, os_type ]
-
-      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")
-
-      os_wmi = WmiLite::Wmi::Instance.new(os)
-
-      expect_any_instance_of(WmiLite::Wmi).to receive(:first_of).with("Win32_OperatingSystem").and_return(os_wmi)
-
-      # Mock a Win32_ComputerSystem OLE32 WMI object
-      x64_system_type = "x64-based PC"
-
-      cs = double("WIN32OLE",
-                  :properties_ => [ double("WIN32OLE", :name => "SystemType") ])
-
-      allow(cs).to receive(:invoke).with("SystemType").and_return(x64_system_type)
-
-      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(@ohai_system.data[:kernel][:name]).to eq("Microsoft Windows 7 Ultimate")
-      expect(@ohai_system.data[:kernel][:release]).to eq("6.1.7601")
-      expect(@ohai_system.data[:kernel][:version]).to eq("6.1.7601 Service Pack 1 Build 7601")
-      expect(@ohai_system.data[:kernel][:os]).to eq("WINNT")
-      expect(@ohai_system.data[:kernel][:machine]).to eq("x86_64")
-    end
-  end
-
 end

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

@@ -45,7 +45,7 @@ describe Ohai::System, "Linux Block Device Plugin" do
     @plugin = get_plugin("linux/block_device")
     allow(@plugin).to receive(:collect_os).and_return(:linux)
 
-    allow(File).to receive(:exists?).with("/sys/block").and_return(true)
+    allow(File).to receive(:exist?).with("/sys/block").and_return(true)
     allow(Dir).to receive(:[]).with("/sys/block/*") do
       DISKS.collect { |disk, _files| "/sys/block/#{disk}" }
     end
@@ -55,7 +55,7 @@ describe Ohai::System, "Linux Block Device Plugin" do
         allow(File).to receive(:open).with(Regexp.new("#{disk}.*#{check}")).and_yield(file_double(value))
       end
 
-      allow(File).to receive(:exists?).with(Regexp.new(disk)) do |arg|
+      allow(File).to receive(:exist?).with(Regexp.new(disk)) do |arg|
         filepath = arg.split("/")
         checks[filepath.last].nil? ? false : true
       end

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

@@ -19,7 +19,7 @@
 require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "Linux filesystem plugin" do
-  let (:plugin) { get_plugin("linux/filesystem") }
+  let(:plugin) { get_plugin("linux/filesystem") }
   before(:each) do
     allow(plugin).to receive(:collect_os).and_return(:linux)
 
@@ -55,11 +55,6 @@ describe Ohai::System, "Linux filesystem plugin" do
     end
   end
 
-  it "sets both filesystem and filesystem2 attributes" do
-    plugin.run
-    expect(plugin[:filesystem]).to eq(plugin[:filesystem2])
-  end
-
   describe "when gathering filesystem usage data from df" do
     before(:each) do
       @stdout = <<-DF
@@ -545,7 +540,7 @@ BLKID_TYPE
       it "logs warning about #{command} missing" do
         Ohai.config[:plugin][:filesystem][:allow_partial_data] = true
         allow(plugin).to receive(:shell_out).with(/#{command}/).and_raise(Ohai::Exceptions::Exec)
-        expect(Ohai::Log).to receive(:warn).with("Plugin Filesystem: #{command} binary is not available. Some data will not be available.")
+        expect_any_instance_of(Mixlib::Log::Child).to receive(:warn).with("Plugin Filesystem: #{command} binary is not available. Some data will not be available.")
         plugin.run
       end
     end

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

@@ -35,8 +35,8 @@ describe Ohai::System, "Linux lsb plugin" do
         and_yield("DISTRIB_CODENAME=hardy").
         and_yield('DISTRIB_DESCRIPTION="Ubuntu 8.04"')
       allow(File).to receive(:open).with("/etc/lsb-release").and_return(@double_file)
-      allow(File).to receive(:exists?).with("/usr/bin/lsb_release").and_return(false)
-      allow(File).to receive(:exists?).with("/etc/lsb-release").and_return(true)
+      allow(File).to receive(:exist?).with("/usr/bin/lsb_release").and_return(false)
+      allow(File).to receive(:exist?).with("/etc/lsb-release").and_return(true)
     end
 
     it "should set lsb[:id]" do
@@ -62,7 +62,7 @@ describe Ohai::System, "Linux lsb plugin" do
 
   describe "on systems with /usr/bin/lsb_release" do
     before(:each) do
-      allow(File).to receive(:exists?).with("/usr/bin/lsb_release").and_return(true)
+      allow(File).to receive(:exist?).with("/usr/bin/lsb_release").and_return(true)
 
       @stdin = double("STDIN", { :close => true })
       @pid = 10
@@ -140,8 +140,8 @@ LSB_RELEASE
   end
 
   it "should not set any lsb values if /etc/lsb-release or /usr/bin/lsb_release do not exist " do
-    allow(File).to receive(:exists?).with("/etc/lsb-release").and_return(false)
-    allow(File).to receive(:exists?).with("/usr/bin/lsb_release").and_return(false)
+    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)
   end
 end

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

@@ -19,9 +19,9 @@
 require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "Linux lspci plugin" do
-  let (:plugin) { get_plugin("linux/lspci") }
-
+  let(:plugin) { get_plugin("linux/lspci") }
   before(:each) do
+    allow(plugin).to receive(:collect_os).and_return(:linux)
     @stdout = <<LSPCI
 Device:	00:1f.3
 Class:	Audio device [0403]

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

@@ -28,8 +28,8 @@ describe Ohai::System, "Machine id plugin" do
   it "should read /etc/machine-id if available" do
     machine_id = "6f702523e2fc7499eb1dc68e5314dacf"
 
-    allow(File).to receive(:exists?).with("/etc/machine-id").and_return(true)
-    allow(File).to receive(:read).with("/etc/machine-id").and_return(machine_id)
+    allow(::File).to receive(:exist?).with("/etc/machine-id").and_return(true)
+    allow(::File).to receive(:read).with("/etc/machine-id").and_return(machine_id)
     plugin.run
     expect(plugin[:machine_id]).to eq(machine_id)
   end
@@ -37,9 +37,9 @@ describe Ohai::System, "Machine id plugin" do
   it "should read /var/lib/dbus/machine-id if available" do
     machine_id = "6f702523e2fc7499eb1dc68e5314dacf"
 
-    allow(File).to receive(:exists?).with("/etc/machine-id").and_return(false)
-    allow(File).to receive(:exists?).with("/var/lib/dbus/machine-id").and_return(true)
-    allow(File).to receive(:read).with("/var/lib/dbus/machine-id").and_return(machine_id)
+    allow(::File).to receive(:exist?).with("/etc/machine-id").and_return(false)
+    allow(::File).to receive(:exist?).with("/var/lib/dbus/machine-id").and_return(true)
+    allow(::File).to receive(:read).with("/var/lib/dbus/machine-id").and_return(machine_id)
     plugin.run
     expect(plugin[:machine_id]).to eq(machine_id)
   end

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

@@ -552,7 +552,7 @@ EOM
       end
 
       it "completes the run" do
-        expect(Ohai::Log).not_to receive(:debug).with(/Plugin linux::network threw exception/)
+        expect(plugin.logger).not_to receive(:trace).with(/Plugin linux::network threw exception/)
         expect(plugin["network"]).not_to be_nil
       end
 
@@ -814,7 +814,7 @@ EOM
     end
 
     it "completes the run" do
-      expect(Ohai::Log).not_to receive(:debug).with(/Plugin linux::network threw exception/)
+      expect(plugin.logger).not_to receive(:trace).with(/Plugin linux::network threw exception/)
       expect(plugin["network"]).not_to be_nil
     end
 
@@ -934,7 +934,7 @@ EOM
         end
 
         it "completes the run" do
-          expect(Ohai::Log).not_to receive(:debug).with(/Plugin linux::network threw exception/)
+          expect(plugin.logger).not_to receive(:trace).with(/Plugin linux::network threw exception/)
           expect(plugin["network"]).not_to be_nil
         end
 
@@ -975,7 +975,7 @@ EOM
         end
 
         it "completes the run" do
-          expect(Ohai::Log).not_to receive(:debug).with(/Plugin linux::network threw exception/)
+          expect(plugin.logger).not_to receive(:trace).with(/Plugin linux::network threw exception/)
           expect(plugin["network"]).not_to be_nil
         end
 
@@ -1018,7 +1018,7 @@ EOM
         end
 
         it "completes the run" do
-          expect(Ohai::Log).not_to receive(:debug).with(/Plugin linux::network threw exception/)
+          expect(plugin.logger).not_to receive(:trace).with(/Plugin linux::network threw exception/)
           expect(plugin["network"]).not_to be_nil
         end
 
@@ -1053,7 +1053,7 @@ EOM
         end
 
         it "completes the run" do
-          expect(Ohai::Log).not_to receive(:debug).with(/Plugin linux::network threw exception/)
+          expect(plugin.logger).not_to receive(:trace).with(/Plugin linux::network threw exception/)
           plugin.run
           expect(plugin["network"]).not_to be_nil
         end
@@ -1094,7 +1094,7 @@ EOM
             let(:linux_ip_route_inet6) { "" }
 
             it "completes the run" do
-              expect(Ohai::Log).not_to receive(:debug).with(/Plugin linux::network threw exception/)
+              expect(plugin.logger).not_to receive(:trace).with(/Plugin linux::network threw exception/)
               plugin.run
               expect(plugin["network"]).not_to be_nil
             end
@@ -1119,7 +1119,7 @@ EOM
         end
 
         it "completes the run" do
-          expect(Ohai::Log).not_to receive(:debug).with(/Plugin linux::network threw exception/)
+          expect(plugin.logger).not_to receive(:trace).with(/Plugin linux::network threw exception/)
           expect(plugin["network"]).not_to be_nil
         end
 
@@ -1140,7 +1140,7 @@ EOM
         end
 
         it "completes the run" do
-          expect(Ohai::Log).not_to receive(:debug).with(/Plugin linux::network threw exception/)
+          expect(plugin.logger).not_to receive(:trace).with(/Plugin linux::network threw exception/)
           expect(plugin["network"]).not_to be_nil
         end
 
@@ -1165,7 +1165,7 @@ EOM
         end
 
         it "completes the run" do
-          expect(Ohai::Log).not_to receive(:debug).with(/Plugin linux::network threw exception/)
+          expect(plugin.logger).not_to receive(:trace).with(/Plugin linux::network threw exception/)
           expect(plugin["network"]).not_to be_nil
         end
 
@@ -1190,7 +1190,7 @@ EOM
         end
 
         it "completes the run" do
-          expect(Ohai::Log).not_to receive(:debug).with(/Plugin linux::network threw exception/)
+          expect(plugin.logger).not_to receive(:trace).with(/Plugin linux::network threw exception/)
           expect(plugin["network"]).not_to be_nil
         end
 
@@ -1224,7 +1224,7 @@ EOM
         end
 
         it "completes the run" do
-          expect(Ohai::Log).not_to receive(:debug).with(/Plugin linux::network threw exception/)
+          expect(plugin.logger).not_to receive(:trace).with(/Plugin linux::network threw exception/)
           expect(plugin["network"]).not_to be_nil
         end
 
@@ -1265,7 +1265,7 @@ EOM
         end
 
         it "completes the run" do
-          expect(Ohai::Log).not_to receive(:debug).with(/Plugin linux::network threw exception/)
+          expect(plugin.logger).not_to receive(:trace).with(/Plugin linux::network threw exception/)
           expect(plugin["network"]).not_to be_nil
         end
 
@@ -1308,7 +1308,7 @@ EOM
         end
 
         it "completes the run" do
-          expect(Ohai::Log).not_to receive(:debug).with(/Plugin linux::network threw exception/)
+          expect(plugin.logger).not_to receive(:trace).with(/Plugin linux::network threw exception/)
           expect(plugin["network"]).not_to be_nil
         end
 
@@ -1336,8 +1336,8 @@ EOM
         end
 
         it "logs a message and skips previously unseen interfaces in 'ip route show'" do
-          expect(Ohai::Log).to receive(:debug).with(/Skipping previously unseen interface from 'ip route show': virbr0/).once
-          allow(Ohai::Log).to receive(:debug) # Catches the 'Loading plugin network' type messages
+          expect(plugin.logger).to receive(:trace).with(/Skipping previously unseen interface from 'ip route show': virbr0/).once
+          allow(plugin.logger).to receive(:trace) # Catches the 'Loading plugin network' type messages
           plugin.run
         end
       end