diff options
author | Lamont Granquist <lamont@chef.io> | 2019-12-09 10:23:25 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-09 10:23:25 -0800 |
commit | 0e021a705ac0d7c2dad4517443974398ade8b2dd (patch) | |
tree | 9ebece2d58c3705df514fbec52df385dc0ae7029 /spec/support/shared/unit | |
parent | 1584bde92cba8151a5a850bef8c4ed9a92c798b6 (diff) | |
parent | 52871d2c8d8bc8ed526b8e3eda9aadb5fa0f93e5 (diff) | |
download | chef-0e021a705ac0d7c2dad4517443974398ade8b2dd.tar.gz |
Add output for the file provider verification (#9039)
Add output for the file provider verification
Diffstat (limited to 'spec/support/shared/unit')
-rw-r--r-- | spec/support/shared/unit/provider/file.rb | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/spec/support/shared/unit/provider/file.rb b/spec/support/shared/unit/provider/file.rb index 36b19675c2..3df8eecc6f 100644 --- a/spec/support/shared/unit/provider/file.rb +++ b/spec/support/shared/unit/provider/file.rb @@ -458,14 +458,24 @@ shared_examples_for Chef::Provider::File do end context "do_validate_content" do - before { setup_normal_file } + let(:tempfile_name) { "foo-bar-baz" } + let(:backupfile) { "/tmp/failed_validations/#{tempfile_name}" } let(:tempfile) do - t = double("Tempfile", path: "/tmp/foo-bar-baz", closed?: true) + t = double("Tempfile", path: "/tmp/#{tempfile_name}", closed?: true) allow(content).to receive(:tempfile).and_return(t) t end + before do + Chef::Config[:file_cache_path] = "/tmp" + allow(File).to receive(:dirname).and_return(tempfile) + allow(File).to receive(:basename).and_return(tempfile_name) + allow(FileUtils).to receive(:mkdir_p).and_return(true) + allow(FileUtils).to receive(:cp).and_return(true) + setup_normal_file + end + context "with user-supplied verifications" do it "calls #verify on each verification with tempfile path" do provider.new_resource.verify windows? ? "REM" : "true" @@ -477,7 +487,8 @@ shared_examples_for Chef::Provider::File do allow(File).to receive(:directory?).with("C:\\Windows\\system32/cmd.exe").and_return(false) provider.new_resource.verify windows? ? "REM" : "true" provider.new_resource.verify windows? ? "cmd.exe /c exit 1" : "false" - expect { provider.send(:do_validate_content) }.to raise_error(Chef::Exceptions::ValidationFailed, "Proposed content for #{provider.new_resource.path} failed verification #{windows? ? "cmd.exe /c exit 1" : "false"}") + msg = "Proposed content for #{provider.new_resource.path} failed verification #{windows? ? "cmd.exe /c exit 1" : "false"}" + expect { provider.send(:do_validate_content) }.to raise_error(Chef::Exceptions::ValidationFailed, /#{msg}/) end it "does not show verification for sensitive resources" do @@ -485,7 +496,8 @@ shared_examples_for Chef::Provider::File do provider.new_resource.verify windows? ? "REM" : "true" provider.new_resource.verify windows? ? "cmd.exe /c exit 1" : "false" provider.new_resource.sensitive true - expect { provider.send(:do_validate_content) }.to raise_error(Chef::Exceptions::ValidationFailed, "Proposed content for #{provider.new_resource.path} failed verification [sensitive]") + msg = "Proposed content for #{provider.new_resource.path} failed verification [sensitive]\nTemporary file moved to #{backupfile}" + expect { provider.send(:do_validate_content) }.to raise_error(Chef::Exceptions::ValidationFailed, msg) end end end |