+ def report
+--- chef-14.1.21/spec/support/shared/context/client.rb~ 2018-05-21 18:22:54.000000000 +0200
++++ chef-14.1.21/spec/support/shared/context/client.rb 2018-07-14 22:12:36.736009017 +0200
+@@ -164,7 +164,7 @@
+
+ before do
+ Chef::Config[:client_fork] = enable_fork
+- Chef::Config[:cache_path] = windows? ? 'C:\chef' : "/var/chef"
++ Chef::Config[:cache_path] = windows? ? 'C:\chef' : "/var/cache/chef"
+ Chef::Config[:why_run] = false
+ Chef::Config[:audit_mode] = :enabled
+ Chef::Config[:chef_guid] = "default-guid"
+--- chef-14.1.21/spec/support/shared/context/config.rb~ 2018-05-21 18:22:54.000000000 +0200
++++ chef-14.1.21/spec/support/shared/context/config.rb 2018-07-14 22:12:53.026479395 +0200
+@@ -13,7 +13,7 @@
+ # Basic config. Nothing fancy.
+ shared_context "default config options" do
+ before do
+- Chef::Config[:cache_path] = windows? ? 'C:\chef' : "/var/chef"
++ Chef::Config[:cache_path] = windows? ? 'C:\chef' : "/var/cache/chef"
+ end
+
+ # Don't need to have an after block to reset the config...
+--- chef-14.1.21/spec/unit/application/solo_spec.rb~ 2018-05-21 18:22:54.000000000 +0200
++++ chef-14.1.21/spec/unit/application/solo_spec.rb 2018-07-14 22:13:57.265002987 +0200
+@@ -206,10 +206,10 @@
+ end
+
+ it "sets the repo path" do
+- expect(Chef::Config).to receive(:find_chef_repo_path).and_return("/var/chef")
++ expect(Chef::Config).to receive(:find_chef_repo_path).and_return("/var/lib/chef")
+ app.reconfigure
+ expect(Chef::Config.has_key?(:chef_repo_path)).to be_truthy
+- expect(Chef::Config[:chef_repo_path]).to eq ("/var/chef")
++ expect(Chef::Config[:chef_repo_path]).to eq ("/var/lib/chef")
+ end
+
+ it "runs chef-client in local mode" do
+--- chef-14.1.21/spec/unit/cookbook/file_vendor_spec.rb~ 2018-05-21 18:22:54.000000000 +0200
++++ chef-14.1.21/spec/unit/cookbook/file_vendor_spec.rb 2018-07-14 22:14:31.759334653 +0200
+@@ -75,7 +75,7 @@
+
+ context "when configured to load files from disk" do
+
+- let(:cookbook_path) { %w{/var/chef/cookbooks /var/chef/other_cookbooks} }
++ let(:cookbook_path) { %w{/var/lib/chef/cookbooks /var/lib/chef/other_cookbooks} }
+
+ let(:manifest) do
+ cbv = Chef::CookbookVersion.new("bob", Array(Dir.tmpdir))
+--- chef-14.1.21/spec/unit/data_bag_spec.rb~ 2018-05-21 18:22:54.000000000 +0200
++++ chef-14.1.21/spec/unit/data_bag_spec.rb 2018-07-14 22:15:36.734550542 +0200
+@@ -243,17 +243,17 @@
+
+ expect do
+ Chef::DataBag.load("foo")
+- end.to raise_error Chef::Exceptions::InvalidDataBagPath, "Data bag path '/var/chef/data_bags' is invalid"
++ end.to raise_error Chef::Exceptions::InvalidDataBagPath, "Data bag path '/var/cache/chef/data_bags' is invalid"
+ end
+
+ end
+
+ describe "data bag with string path" do
+- it_should_behave_like "data bag in solo mode", "/var/chef/data_bags"
++ it_should_behave_like "data bag in solo mode", "/var/cache/chef/data_bags"
+ end
+
+ describe "data bag with array path" do
+- it_should_behave_like "data bag in solo mode", ["/var/chef/data_bags", "/var/chef/data_bags_2"]
++ it_should_behave_like "data bag in solo mode", ["/var/cache/chef/data_bags", "/var/cache/chef/data_bags_2"]
+ end
+ end
+
+--- chef-14.1.21/spec/unit/environment_spec.rb~ 2018-05-21 18:22:54.000000000 +0200
++++ chef-14.1.21/spec/unit/environment_spec.rb 2018-07-14 22:16:20.332481816 +0200
+@@ -393,7 +393,7 @@
+ describe "in solo mode" do
+ before do
+ Chef::Config[:solo_legacy_mode] = true
+- Chef::Config[:environment_path] = "/var/chef/environments"
++ Chef::Config[:environment_path] = "/var/cache/chef/environments"
+ end
+
+ after do
+@@ -452,7 +452,7 @@
+
+ expect do
+ Chef::Environment.load("foo")
+- end.to raise_error Chef::Exceptions::InvalidEnvironmentPath, "Environment path '/var/chef/environments' is invalid"
++ end.to raise_error Chef::Exceptions::InvalidEnvironmentPath, "Environment path '/var/cache/chef/environments' is invalid"
+ end
+
+ it "should raise an error if the file does not exist" do
+--- chef-14.1.21/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb~ 2018-05-21 18:22:54.000000000 +0200
++++ chef-14.1.21/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb 2018-07-14 22:17:33.390766108 +0200
+@@ -42,7 +42,7 @@
+ @outputter = Chef::Formatters::IndentableOutputStream.new(@stdout, STDERR)
+ #@outputter = Chef::Formatters::IndentableOutputStream.new(STDOUT, STDERR)
+
+- allow(Chef::Config).to receive(:cookbook_path).and_return([ "/var/chef/cache" ])
++ allow(Chef::Config).to receive(:cookbook_path).and_return([ "/var/lib/chef" ])
+ end
+
+ describe "when explaining an error converging a resource" do
+@@ -58,8 +58,8 @@
+ end
+
+ @trace = [
+- "/var/chef/cache/cookbooks/syntax-err/recipes/default.rb:14:in `from_file'",
+- "/var/chef/cache/cookbooks/syntax-err/recipes/default.rb:11:in `from_file'",
++ "/var/lib/chef/cookbooks/syntax-err/recipes/default.rb:14:in `from_file'",
++ "/var/lib/chef/cookbooks/syntax-err/recipes/default.rb:11:in `from_file'",
+ "/usr/local/lib/ruby/gems/chef/lib/chef/client.rb:123:in `run'" # should not display
+ ]
+ @exception = Chef::Exceptions::Package.new("No such package 'non-existing-package'")
+@@ -70,8 +70,8 @@
+
+ it "filters chef core code from the backtrace" do
+ @expected_filtered_trace = [
+- "/var/chef/cache/cookbooks/syntax-err/recipes/default.rb:14:in `from_file'",
+- "/var/chef/cache/cookbooks/syntax-err/recipes/default.rb:11:in `from_file'",
++ "/var/lib/chef/cookbooks/syntax-err/recipes/default.rb:14:in `from_file'",
++ "/var/lib/chef/cookbooks/syntax-err/recipes/default.rb:11:in `from_file'",
+ ]
+
+ expect(@inspector.filtered_bt).to eq(@expected_filtered_trace)
+--- chef-14.1.21/spec/unit/role_spec.rb~ 2018-05-21 18:22:54.000000000 +0200
++++ chef-14.1.21/spec/unit/role_spec.rb 2018-07-14 22:18:45.421896466 +0200
+@@ -252,7 +252,7 @@
+
+ describe "when loading from disk" do
+ before do
+- default_cache_path = windows? ? 'C:\chef' : "/var/chef"
++ default_cache_path = windows? ? 'C:\chef' : "/var/cache/chef"
+ allow(Chef::Config).to receive(:cache_path).and_return(default_cache_path)
+ end
+
+--- chef-14.1.21/spec/unit/run_lock_spec.rb~ 2018-05-21 18:22:54.000000000 +0200
++++ chef-14.1.21/spec/unit/run_lock_spec.rb 2018-07-14 22:19:37.309448017 +0200
+@@ -20,8 +20,8 @@
+
+ describe Chef::RunLock do
+
+- default_cache_path = windows? ? 'C:\chef' : "/var/chef"
+- default_pid_location = windows? ? 'C:\chef\cache\chef-client-running.pid' : "/var/chef/cache/chef-client-running.pid"
++ default_cache_path = windows? ? 'C:\chef' : "/var/cache/chef"
++ default_pid_location = windows? ? 'C:\chef\cache\chef-client-running.pid' : "/var/cache/chef/chef-client-running.pid"
+
+ describe "when first created" do
+ it "locates the lockfile in the file cache path by default" do