diff options
author | Phil Dibowitz <phil@ipom.com> | 2016-06-06 18:35:16 +0100 |
---|---|---|
committer | Phil Dibowitz <phil@ipom.com> | 2016-06-06 18:35:16 +0100 |
commit | 45419b1d57c6303bca910dea0270b5c2b0b6efe4 (patch) | |
tree | d6eb0dc342b223cca2b4d55b2571e56777398b4a | |
parent | 8c9b41f3ec6b28c110439b53731a3111aa29437e (diff) | |
download | chef-45419b1d57c6303bca910dea0270b5c2b0b6efe4.tar.gz |
Don't mask directory deletion errors (#4991)
closes #4988
-rw-r--r-- | lib/chef/provider/directory.rb | 4 | ||||
-rw-r--r-- | spec/unit/provider/directory_spec.rb | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/lib/chef/provider/directory.rb b/lib/chef/provider/directory.rb index 7cc05259b6..619ab5d8b6 100644 --- a/lib/chef/provider/directory.rb +++ b/lib/chef/provider/directory.rb @@ -145,7 +145,9 @@ class Chef if ::File.exists?(@new_resource.path) converge_by("delete existing directory #{@new_resource.path}") do if @new_resource.recursive == true - FileUtils.rm_rf(@new_resource.path) + # we don't use rm_rf here because it masks all errors, including + # IO errors or permission errors that would prvent the deletion + FileUtils.rm_r(@new_resource.path) Chef::Log.info("#{@new_resource} deleted #{@new_resource.path} recursively") else ::Dir.delete(@new_resource.path) diff --git a/spec/unit/provider/directory_spec.rb b/spec/unit/provider/directory_spec.rb index f8864af7f8..aebbaa6e81 100644 --- a/spec/unit/provider/directory_spec.rb +++ b/spec/unit/provider/directory_spec.rb @@ -227,7 +227,7 @@ describe Chef::Provider::Directory do end end - describe "#run_action(:create)" do + describe "#run_action(:delete)" do describe "when the directory exists" do it "deletes the directory" do directory.run_action(:delete) @@ -238,6 +238,16 @@ describe Chef::Provider::Directory do directory.run_action(:delete) expect(new_resource).to be_updated end + + it "does not use rm_rf which silently consumes errors" do + expect(FileUtils).not_to receive(:rm_rf) + expect(FileUtils).to receive(:rm_r) + # set recursive or FileUtils isn't used at all. + new_resource.recursive(true) + directory.run_action(:delete) + # reset back... + new_resource.recursive(false) + end end describe "when the directory does not exist" do |