chef 13.12.14-universal-mingw32 → 14.0.190-universal-mingw32

data/spec/unit/provider/cookbook_file_spec.rb

@@ -25,7 +25,8 @@ require "support/shared/unit/provider/file"
 describe Chef::Provider::CookbookFile do
   let(:node) { double("Chef::Node") }
   let(:events) { double("Chef::Events").as_null_object } # mock all the methods
-  let(:run_context) { double("Chef::RunContext", :node => node, :events => events) }
+  let(:logger) { double("Mixlib::Log::Child").as_null_object }
+  let(:run_context) { double("Chef::RunContext", :node => node, :events => events, :logger => logger) }
   let(:enclosing_directory) do
     canonicalize_path(File.expand_path(File.join(CHEF_SPEC_DATA, "templates")))
   end

data/spec/unit/provider/cron/unix_spec.rb

@@ -41,10 +41,15 @@ describe Chef::Provider::Cron::Unix do
   let(:exitstatus) { 0 }
   let(:shell_out) { double("Mixlib::ShellOut", :status => status, :stdout => stdout, :stderr => stderr) }
 
+  let(:logger) { double("Mixlib::Log::Child").as_null_object }
+
   it "is a Chef::Provider:Cron" do
     expect(provider).to be_a(Chef::Provider::Cron)
   end
 
+  before do
+    allow(run_context).to receive(:logger).and_return(logger)
+  end
   describe "read_crontab" do
     let(:stderr) { "" }
     let(:stdout) do
@@ -59,7 +64,7 @@ describe Chef::Provider::Cron::Unix do
     end
 
     before do
-      allow(Chef::Log).to receive(:debug)
+      allow(logger).to receive(:trace)
       allow(shell_out).to receive(:format_for_exception).and_return("formatted command output")
       allow(provider).to receive(:shell_out).with("/usr/bin/crontab -l", :user => username).and_return(shell_out)
     end
@@ -83,7 +88,7 @@ describe Chef::Provider::Cron::Unix do
 
       it "logs the crontab output to debug" do
         provider.send(:read_crontab)
-        expect(Chef::Log).to have_received(:debug).with("formatted command output")
+        expect(logger).to have_received(:trace).with("formatted command output")
       end
     end
 
@@ -98,7 +103,7 @@ describe Chef::Provider::Cron::Unix do
 
       it "logs the crontab output to debug" do
         provider.send(:read_crontab) rescue nil
-        expect(Chef::Log).to have_received(:debug).with("formatted command output")
+        expect(logger).to have_received(:trace).with("formatted command output")
       end
     end
   end

data/spec/unit/provider/cron_spec.rb

@@ -19,16 +19,23 @@
 require "spec_helper"
 
 describe Chef::Provider::Cron do
+  let(:logger) { double("Mixlib::Log::Child").as_null_object }
+
+  before do
+    @node = Chef::Node.new
+    @events = Chef::EventDispatch::Dispatcher.new
+    @run_context = Chef::RunContext.new(@node, {}, @events)
+    allow(@run_context).to receive(:logger).and_return(logger)
+
+    @new_resource = Chef::Resource::Cron.new("cronhole some stuff", @run_context)
+    @new_resource.user "root"
+    @new_resource.minute "30"
+    @new_resource.command "/bin/true"
+    @provider = Chef::Provider::Cron.new(@new_resource, @run_context)
+  end
+
   describe "when with special time string" do
     before do
-      @node = Chef::Node.new
-      @events = Chef::EventDispatch::Dispatcher.new
-      @run_context = Chef::RunContext.new(@node, {}, @events)
-
-      @new_resource = Chef::Resource::Cron.new("cronhole some stuff", @run_context)
-      @new_resource.user "root"
-      @new_resource.minute "30"
-      @new_resource.command "/bin/true"
       @new_resource.time :reboot
       @provider = Chef::Provider::Cron.new(@new_resource, @run_context)
     end
@@ -113,7 +120,7 @@ CRONTAB
       end
 
       it "should report the match" do
-        expect(Chef::Log).to receive(:debug).with("Found cron '#{@new_resource.name}'")
+        expect(logger).to receive(:trace).with("Found cron '#{@new_resource.name}'")
         @provider.load_current_resource
       end
 
@@ -141,18 +148,6 @@ CRONTAB
     end
   end
 
-  before do
-    @node = Chef::Node.new
-    @events = Chef::EventDispatch::Dispatcher.new
-    @run_context = Chef::RunContext.new(@node, {}, @events)
-
-    @new_resource = Chef::Resource::Cron.new("cronhole some stuff", @run_context)
-    @new_resource.user "root"
-    @new_resource.minute "30"
-    @new_resource.command "/bin/true"
-    @provider = Chef::Provider::Cron.new(@new_resource, @run_context)
-  end
-
   describe "when examining the current system state" do
     context "with no crontab for the user" do
       before :each do
@@ -166,7 +161,7 @@ CRONTAB
       end
 
       it "should report an empty crontab" do
-        expect(Chef::Log).to receive(:debug).with("Cron empty for '#{@new_resource.user}'")
+        expect(logger).to receive(:trace).with("Cron empty for '#{@new_resource.user}'")
         @provider.load_current_resource
       end
     end
@@ -190,7 +185,7 @@ CRONTAB
       end
 
       it "should report no entry found" do
-        expect(Chef::Log).to receive(:debug).with("Cron '#{@new_resource.name}' not found")
+        expect(logger).to receive(:trace).with("Cron '#{@new_resource.name}' not found")
         @provider.load_current_resource
       end
 
@@ -296,7 +291,7 @@ CRONTAB
       end
 
       it "should report the match" do
-        expect(Chef::Log).to receive(:debug).with("Found cron '#{@new_resource.name}'")
+        expect(logger).to receive(:trace).with("Found cron '#{@new_resource.name}'")
         @provider.load_current_resource
       end
     end
@@ -332,7 +327,7 @@ CRONTAB
       end
 
       it "should report the match" do
-        expect(Chef::Log).to receive(:debug).with("Found cron '#{@new_resource.name}'")
+        expect(logger).to receive(:trace).with("Found cron '#{@new_resource.name}'")
         @provider.load_current_resource
       end
     end
@@ -478,7 +473,7 @@ TEST=LOL
       end
 
       it "should log the action" do
-        expect(Chef::Log).to receive(:info).with("cron[cronhole some stuff] added crontab entry")
+        expect(logger).to receive(:info).with("cron[cronhole some stuff] added crontab entry")
         @provider.run_action(:create)
       end
     end
@@ -540,7 +535,7 @@ TEST=LOL
       end
 
       it "should log the action" do
-        expect(Chef::Log).to receive(:info).with("cron[cronhole some stuff] added crontab entry")
+        expect(logger).to receive(:info).with("cron[cronhole some stuff] added crontab entry")
         @provider.run_action(:create)
       end
     end
@@ -605,7 +600,7 @@ TEST=LOL
       end
 
       it "should log the action" do
-        expect(Chef::Log).to receive(:info).with("cron[cronhole some stuff] updated crontab entry")
+        expect(logger).to receive(:info).with("cron[cronhole some stuff] updated crontab entry")
         @provider.run_action(:create)
       end
     end
@@ -719,8 +714,8 @@ CRONTAB
       end
 
       it "should log nothing changed" do
-        expect(Chef::Log).to receive(:debug).with("Found cron '#{@new_resource.name}'")
-        expect(Chef::Log).to receive(:debug).with("Skipping existing cron entry '#{@new_resource.name}'")
+        expect(logger).to receive(:trace).with("Found cron '#{@new_resource.name}'")
+        expect(logger).to receive(:trace).with("Skipping existing cron entry '#{@new_resource.name}'")
         @provider.run_action(:create)
       end
     end
@@ -739,7 +734,7 @@ CRONTAB
 
       it "should do nothing" do
         expect(@provider).not_to receive(:write_crontab)
-        expect(Chef::Log).not_to receive(:info)
+        expect(logger).not_to receive(:info)
         @provider.run_action(:delete)
       end
 
@@ -806,7 +801,7 @@ FOO=test
       end
 
       it "should log the action" do
-        expect(Chef::Log).to receive(:info).with("#{@new_resource} deleted crontab entry")
+        expect(logger).to receive(:info).with("#{@new_resource} deleted crontab entry")
         @provider.run_action(:delete)
       end
     end

data/spec/unit/provider/file_spec.rb

@@ -34,7 +34,8 @@ describe Chef::Provider::File do
 
   let(:node) { double("Chef::Node") }
   let(:events) { double("Chef::Events").as_null_object } # mock all the methods
-  let(:run_context) { double("Chef::RunContext", :node => node, :events => events) }
+  let(:logger) { double("Mixlib::Log::Child").as_null_object }
+  let(:run_context) { double("Chef::RunContext", :node => node, :events => events, :logger => logger) }
   let(:enclosing_directory) do
     canonicalize_path(File.expand_path(File.join(CHEF_SPEC_DATA, "templates")))
   end

data/spec/unit/provider/group/dscl_spec.rb

@@ -19,10 +19,13 @@
 require "spec_helper"
 
 describe Chef::Provider::Group::Dscl do
+  let(:logger) { double("Mixlib::Log::Child").as_null_object }
+
   before do
     @node = Chef::Node.new
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
+    allow(@run_context).to receive(:logger).and_return(logger)
     @new_resource = Chef::Resource::Group.new("aj")
     @current_resource = Chef::Resource::Group.new("aj")
     @provider = Chef::Provider::Group::Dscl.new(@new_resource, @run_context)
@@ -45,8 +48,7 @@ describe Chef::Provider::Group::Dscl do
 
   describe "safe_dscl" do
     before do
-      @node = Chef::Node.new
-      @provider = Chef::Provider::Group::Dscl.new(@node, @new_resource)
+      @provider = Chef::Provider::Group::Dscl.new(@new_resource, @run_context)
       allow(@provider).to receive(:dscl).and_return(["cmd", @status, "stdout", "stderr"])
     end
 
@@ -93,8 +95,7 @@ describe Chef::Provider::Group::Dscl do
 
   describe "get_free_gid" do
     before do
-      @node = Chef::Node.new
-      @provider = Chef::Provider::Group::Dscl.new(@node, @new_resource)
+      @provider = Chef::Provider::Group::Dscl.new(@new_resource, @run_context)
       allow(@provider).to receive(:safe_dscl).and_return("\naj      200\njt      201\n")
     end
 
@@ -115,8 +116,6 @@ describe Chef::Provider::Group::Dscl do
 
   describe "gid_used?" do
     before do
-      @node = Chef::Node.new
-      @provider = Chef::Provider::Group::Dscl.new(@node, @new_resource)
       allow(@provider).to receive(:safe_dscl).and_return(<<-eos
         someprogram		somethingElse:gid = (
             500
@@ -197,7 +196,7 @@ describe Chef::Provider::Group::Dscl do
       end
 
       it "should log an appropriate message" do
-        expect(Chef::Log).to receive(:debug).with("group[aj] removing group members all your base")
+        expect(logger).to receive(:trace).with("group[aj] removing group members all your base")
         @provider.set_members
       end
 
@@ -215,7 +214,7 @@ describe Chef::Provider::Group::Dscl do
       end
 
       it "should log an appropriate debug message" do
-        expect(Chef::Log).to receive(:debug).with("group[aj] setting group members all, your, base")
+        expect(logger).to receive(:trace).with("group[aj] setting group members all, your, base")
         @provider.set_members
       end
 

data/spec/unit/provider/group/gpasswd_spec.rb

@@ -19,10 +19,13 @@
 require "spec_helper"
 
 describe Chef::Provider::Group::Gpasswd, "modify_group_members" do
+  let(:logger) { double("Mixlib::Log::Child").as_null_object }
+
   before do
     @node = Chef::Node.new
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
+    allow(@run_context).to receive(:logger).and_return(logger)
     @new_resource = Chef::Resource::Group.new("wheel")
     @new_resource.members %w{lobster rage fist}
     @new_resource.append false
@@ -65,7 +68,7 @@ describe Chef::Provider::Group::Gpasswd, "modify_group_members" do
       end
 
       it "logs a message and sets group's members to 'none'" do
-        expect(Chef::Log).to receive(:debug).with("group[wheel] setting group members to: none")
+        expect(logger).to receive(:trace).with("group[wheel] setting group members to: none")
         expect(@provider).to receive(:shell_out!).with("gpasswd", "-M", "", "wheel")
         @provider.modify_group_members
       end
@@ -85,7 +88,7 @@ describe Chef::Provider::Group::Gpasswd, "modify_group_members" do
 
     describe "when the resource specifies group members" do
       it "should log an appropriate debug message" do
-        expect(Chef::Log).to receive(:debug).with("group[wheel] setting group members to: lobster, rage, fist")
+        expect(logger).to receive(:trace).with("group[wheel] setting group members to: lobster, rage, fist")
         allow(@provider).to receive(:shell_out!)
         @provider.modify_group_members
       end

data/spec/unit/provider/group/groupmod_spec.rb

@@ -19,10 +19,13 @@
 require "spec_helper"
 
 describe Chef::Provider::Group::Groupmod do
+  let(:logger) { double("Mixlib::Log::Child").as_null_object }
+
   before do
     @node = Chef::Node.new
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
+    allow(@run_context).to receive(:logger).and_return(logger)
     @new_resource = Chef::Resource::Group.new("wheel")
     @new_resource.gid 123
     @new_resource.members %w{lobster rage fist}
@@ -61,7 +64,7 @@ describe Chef::Provider::Group::Groupmod do
         end
 
         it "logs a message and sets group's members to 'none', then removes existing group members" do
-          expect(Chef::Log).to receive(:debug).with("group[wheel] setting group members to: none")
+          expect(logger).to receive(:trace).with("group[wheel] setting group members to: none")
           expect(@provider).to receive(:shell_out!).with("group", "mod", "-n", "wheel_bak", "wheel")
           expect(@provider).to receive(:shell_out!).with("group", "add", "-g", "123", "-o", "wheel")
           expect(@provider).to receive(:shell_out!).with("group", "del", "wheel_bak")
@@ -76,7 +79,7 @@ describe Chef::Provider::Group::Groupmod do
         end
 
         it "logs a message and does not modify group membership" do
-          expect(Chef::Log).to receive(:debug).with("group[wheel] not changing group members, the group has no members to add")
+          expect(logger).to receive(:trace).with("group[wheel] not changing group members, the group has no members to add")
           expect(@provider).not_to receive(:shell_out!)
           @provider.manage_group
         end
@@ -89,7 +92,7 @@ describe Chef::Provider::Group::Groupmod do
         end
 
         it "updates group membership correctly" do
-          allow(Chef::Log).to receive(:debug)
+          allow(logger).to receive(:trace)
           expect(@provider).to receive(:shell_out!).with("group", "mod", "-n", "wheel_bak", "wheel")
           expect(@provider).to receive(:shell_out!).with("user", "mod", "-G", "wheel", "lobster")
           expect(@provider).to receive(:shell_out!).with("group", "add", "-g", "123", "-o", "wheel")

data/spec/unit/provider/group/pw_spec.rb

@@ -19,10 +19,13 @@
 require "spec_helper"
 
 describe Chef::Provider::Group::Pw do
+  let(:logger) { double("Mixlib::Log::Child").as_null_object }
+
   before do
     @node = Chef::Node.new
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
+    allow(@run_context).to receive(:logger).and_return(logger)
 
     @new_resource = Chef::Resource::Group.new("wheel")
     @new_resource.gid 50
@@ -93,7 +96,7 @@ describe Chef::Provider::Group::Pw do
       end
 
       it "should log an appropriate message" do
-        expect(Chef::Log).to receive(:debug).with("group[wheel] removing group members: all,your,base")
+        expect(logger).to receive(:trace).with("group[wheel] removing group members: all,your,base")
         @provider.set_members_options
       end
 
@@ -109,7 +112,7 @@ describe Chef::Provider::Group::Pw do
       end
 
       it "should log an appropriate debug message" do
-        expect(Chef::Log).to receive(:debug).with("group[wheel] adding group members: all,your,base")
+        expect(logger).to receive(:trace).with("group[wheel] adding group members: all,your,base")
         @provider.set_members_options
       end
 

data/spec/unit/provider/link_spec.rb

@@ -25,11 +25,13 @@ if Chef::Platform.windows?
   require "chef/win32/file" #probably need this in spec_helper
 end
 
-describe Chef::Resource::Link, :not_supported_on_win2k3 do
+describe Chef::Resource::Link do
+  let(:logger) { double("Mixlib::Log::Child").as_null_object }
   let(:provider) do
     node = Chef::Node.new
     @events = Chef::EventDispatch::Dispatcher.new
     run_context = Chef::RunContext.new(node, {}, @events)
+    allow(run_context).to receive(:logger).and_return(logger)
     Chef::Provider::Link.new(new_resource, run_context)
   end
   let(:new_resource) do
@@ -270,7 +272,7 @@ describe Chef::Resource::Link, :not_supported_on_win2k3 do
 
       it "invokes Dir.delete method to delete the link" do
         expect(::Dir).to receive(:delete).with(provider.new_resource.target_file)
-        expect(Chef::Log).to receive(:info).with("#{provider.new_resource} deleted")
+        expect(logger).to receive(:info).with("#{provider.new_resource} deleted")
         provider.run_action(:delete)
       end
     end
@@ -283,7 +285,7 @@ describe Chef::Resource::Link, :not_supported_on_win2k3 do
 
       it "invokes File.delete method to delete the link" do
         expect(::File).to receive(:delete).with(provider.new_resource.target_file)
-        expect(Chef::Log).to receive(:info).with("#{provider.new_resource} deleted")
+        expect(logger).to receive(:info).with("#{provider.new_resource} deleted")
         provider.run_action(:delete)
       end
     end
@@ -296,7 +298,7 @@ describe Chef::Resource::Link, :not_supported_on_win2k3 do
 
       it "invokes File.delete method to delete the link" do
         expect(::File).to receive(:delete).with(provider.new_resource.target_file)
-        expect(Chef::Log).to receive(:info).with("#{provider.new_resource} deleted")
+        expect(logger).to receive(:info).with("#{provider.new_resource} deleted")
         provider.run_action(:delete)
       end
     end

data/spec/unit/provider/log_spec.rb

@@ -32,44 +32,49 @@ describe Chef::Provider::Log::ChefLog do
 
   let(:provider) { Chef::Provider::Log::ChefLog.new(new_resource, run_context) }
 
-  it "should write the string to the Chef::Log object at default level (info)" do
-    expect(Chef::Log).to receive(:info).with(log_str).and_return(true)
+  let(:logger) { double("Mixlib::Log::Child").as_null_object }
+  before do
+    allow(run_context).to receive(:logger).and_return(logger)
+  end
+
+  it "should write the string to the logger object at default level (info)" do
+    expect(logger).to receive(:info).with(log_str).and_return(true)
     provider.run_action(:write)
   end
 
-  it "should write the string to the Chef::Log object at debug level" do
+  it "should write the string to the logger object at debug level" do
     new_resource.level :debug
-    expect(Chef::Log).to receive(:debug).with(log_str).and_return(true)
+    expect(logger).to receive(:debug).with(log_str).and_return(true)
     provider.run_action(:write)
   end
 
-  it "should write the string to the Chef::Log object at info level" do
+  it "should write the string to the logger object at info level" do
     new_resource.level :info
-    expect(Chef::Log).to receive(:info).with(log_str).and_return(true)
+    expect(logger).to receive(:info).with(log_str).and_return(true)
     provider.run_action(:write)
   end
 
-  it "should write the string to the Chef::Log object at warn level" do
+  it "should write the string to the logger object at warn level" do
     new_resource.level :warn
-    expect(Chef::Log).to receive(:warn).with(log_str).and_return(true)
+    expect(logger).to receive(:warn).with(log_str).and_return(true)
     provider.run_action(:write)
   end
 
-  it "should write the string to the Chef::Log object at error level" do
+  it "should write the string to the logger object at error level" do
     new_resource.level :error
-    expect(Chef::Log).to receive(:error).with(log_str).and_return(true)
+    expect(logger).to receive(:error).with(log_str).and_return(true)
     provider.run_action(:write)
   end
 
-  it "should write the string to the Chef::Log object at fatal level" do
+  it "should write the string to the logger object at fatal level" do
     new_resource.level :fatal
-    expect(Chef::Log).to receive(:fatal).with(log_str).and_return(true)
+    expect(logger).to receive(:fatal).with(log_str).and_return(true)
     provider.run_action(:write)
   end
 
   it "should print the string in why-run mode" do
     Chef::Config[:why_run] = true
-    expect(Chef::Log).to receive(:info).with(log_str).and_return(true)
+    expect(logger).to receive(:info).with(log_str).and_return(true)
     provider.run_action(:write)
   end