Merge pull request #6867 from chef/tm/fix_ohai_tests

fix ohai tests after require_plugin removal

2 files changed, 2 insertions, 5 deletions

diff --git a/lib/chef/knife/configure.rb b/lib/chef/knife/configure.rb
index 10ae62b6c9..b277a14a3e 100644
--- a/lib/chef/knife/configure.rb
+++ b/lib/chef/knife/configure.rb
@@ -131,9 +131,7 @@ EOH
 
       def guess_servername
         o = Ohai::System.new
-        o.load_plugins
-        o.require_plugin "os"
-        o.require_plugin "hostname"
+        o.all_plugins(%w{ os hostname fqdn })
         o[:fqdn] || o[:machinename] || o[:hostname] || "localhost"
       end
 
diff --git a/spec/unit/knife/configure_spec.rb b/spec/unit/knife/configure_spec.rb
index f1d3bd0745..27bb0d9a3f 100644
--- a/spec/unit/knife/configure_spec.rb
+++ b/spec/unit/knife/configure_spec.rb
@@ -26,8 +26,7 @@ describe Chef::Knife::Configure do
 
   let(:ohai) do
     o = {}
-    allow(o).to receive(:require_plugin)
-    allow(o).to receive(:load_plugins)
+    allow(o).to receive(:all_plugins).with(%w{ os hostname fqdn })
     o[:fqdn] = fqdn
     o
   end