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

data/spec/unit/application/client_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: AJ Christensen (<aj@junglist.gen.nz>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2008-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -107,6 +107,7 @@ describe Chef::Application::Client, "reconfigure" do
     shared_examples "sets the configuration" do |cli_arguments, expected_config|
       describe cli_arguments do
         before do
+          cli_arguments ||= ""
           ARGV.replace(cli_arguments.split)
           app.reconfigure
         end
@@ -144,6 +145,36 @@ describe Chef::Application::Client, "reconfigure" do
       end
     end
 
+    describe "--[no]-fork" do
+      before do
+        Chef::Config[:interval] = nil # FIXME: we're overriding the before block setting this
+      end
+
+      context "by default" do
+        it_behaves_like "sets the configuration", "", client_fork: false
+      end
+
+      context "with --fork" do
+        it_behaves_like "sets the configuration", "--fork", client_fork: true
+      end
+
+      context "with --no-fork" do
+        it_behaves_like "sets the configuration", "--no-fork", client_fork: false
+      end
+
+      context "with an interval" do
+        it_behaves_like "sets the configuration", "--interval 1800", client_fork: true
+      end
+
+      context "with once" do
+        it_behaves_like "sets the configuration", "--once", client_fork: false
+      end
+
+      context "with daemonize", :unix_only do
+        it_behaves_like "sets the configuration", "--daemonize", client_fork: true
+      end
+    end
+
     describe "--config-option" do
       context "with a single value" do
         it_behaves_like "sets the configuration", "--config-option chef_server_url=http://example",
@@ -186,21 +217,16 @@ describe Chef::Application::Client, "reconfigure" do
       Chef::Config[:splay] = nil
     end
 
-    context "when interval is given" do
-      before do
-        Chef::Config[:interval] = 600
-        allow(ChefConfig).to receive(:windows?).and_return(false)
-      end
-
-      it "should terminate with message" do
-        expect(Chef::Application).to receive(:fatal!).with(
-"Unforked chef-client interval runs are disabled in Chef 12.
+    it "should terminal with message when interval is given" do
+      Chef::Config[:interval] = 600
+      allow(ChefConfig).to receive(:windows?).and_return(false)
+      expect(Chef::Application).to receive(:fatal!).with(
+        "Unforked chef-client interval runs are disabled in Chef 12.
 Configuration settings:
   interval  = 600 seconds
 Enable chef-client interval runs by setting `:client_fork = true` in your config file or adding `--fork` to your command line options."
-        )
-        app.reconfigure
-      end
+      )
+      app.reconfigure
     end
 
     context "when interval is given on windows" do

data/spec/unit/application/solo_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: AJ Christensen (<aj@junglist.gen.nz>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2008-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -203,13 +203,6 @@ Enable chef-client interval runs by setting `:client_fork = true` in your config
         app.reconfigure
         expect(ARGV.include?("--ez")).to be_falsey
       end
-
-      it "replaces -r with --recipe-url" do
-        ARGV.push("-r", "http://junglist.gen.nz/recipes.tgz")
-        app.reconfigure
-        expect(ARGV.include?("-r")).to be_falsey
-        expect(ARGV.include?("--recipe-url")).to be_truthy
-      end
     end
 
     it "sets the repo path" do

data/spec/unit/application_spec.rb

@@ -1,7 +1,7 @@
 #
 # Author:: AJ Christensen (<aj@junglist.gen.nz>)
 # Author:: Mark Mzyk (mmzyk@chef.io)
-# Copyright:: Copyright 2008-2017, Chef Software Inc.
+# Copyright:: Copyright 2008-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -171,7 +171,7 @@ describe Chef::Application do
           @app.config[:config_file] = "/etc/chef/notfound"
         end
         it "should use the passed in command line options and defaults" do
-          expect(Chef::Config).to receive(:merge!)
+          expect(Chef::Config).to receive(:merge!).at_least(:once)
           @app.configure_chef
         end
       end
@@ -418,4 +418,68 @@ describe Chef::Application do
       end
     end
   end
+
+  describe "merged config" do
+    class MyTestConfig < Chef::Config
+      extend Mixlib::Config
+
+      default :test_config_1, "config default"
+      default :test_config_2, "config default"
+    end
+
+    class MyAppClass < Chef::Application
+      # there's an implicit test here that mixlib-cli's separate_default_options is being inherited
+      option :test_config_2, long: "--test-config2 CONFIG", default: "cli default"
+    end
+
+    before(:each) do
+      MyTestConfig.reset
+      @original_argv = ARGV.dup
+      ARGV.clear
+      @app = MyAppClass.new
+      expect(@app).to receive(:chef_config).at_least(:once).and_return(MyTestConfig)
+      expect(Chef::ConfigFetcher).to receive(:new).and_return(fake_config_fetcher)
+      allow(@app).to receive(:log).and_return(instance_double(Mixlib::Log, warn: nil)) # ignorken
+    end
+
+    after(:each) do
+      ARGV.replace(@original_argv)
+    end
+
+    let(:fake_config_fetcher) { instance_double(Chef::ConfigFetcher, expanded_path: "/thisbetternotexist", :"config_missing?" => false, read_config: "" ) }
+
+    it "reading a mixlib-config default works" do
+      @app.parse_options
+      @app.load_config_file
+      expect(MyTestConfig[:test_config_1]).to eql("config default")
+    end
+
+    it "a mixlib-cli default overrides a mixlib-config default" do
+      @app.parse_options
+      @app.load_config_file
+      expect(MyTestConfig[:test_config_2]).to eql("cli default")
+    end
+
+    it "a set mixlib-config value overrides a mixlib-config default" do
+      expect(fake_config_fetcher).to receive(:read_config).and_return(%q{test_config_1 "config setting"})
+      @app.parse_options
+      @app.load_config_file
+      expect(MyTestConfig[:test_config_1]).to eql("config setting")
+    end
+
+    it "a set mixlib-config value overrides a mixlib-cli default" do
+      expect(fake_config_fetcher).to receive(:read_config).and_return(%q{test_config_2 "config setting"})
+      @app.parse_options
+      @app.load_config_file
+      expect(MyTestConfig[:test_config_2]).to eql("config setting")
+    end
+
+    it "a set mixlib-cli value overrides everything else" do
+      expect(fake_config_fetcher).to receive(:read_config).and_return(%q{test_config_2 "config setting"})
+      ARGV.replace("--test-config2 cli-setting".split)
+      @app.parse_options
+      @app.load_config_file
+      expect(MyTestConfig[:test_config_2]).to eql("cli-setting")
+    end
+  end
 end

data/spec/unit/audit/audit_event_proxy_spec.rb

@@ -44,7 +44,7 @@ describe Chef::Audit::AuditEventProxy do
       let(:parents) { [double("ExampleGroup")] }
 
       it "notifies control_group_started event" do
-        expect(Chef::Log).to receive(:debug).
+        expect(Chef::Log).to receive(:trace).
           with("Entered \`control_group\` block named poots")
         expect(events).to receive(:control_group_started).
           with(description)

data/spec/unit/audit/audit_reporter_spec.rb

@@ -2,7 +2,7 @@
 # Author:: Tyler Ball (<tball@chef.io>)
 # Author:: Claire McQuin (<claire@chef.io>)
 #
-# Copyright:: Copyright 2014-2016, Chef Software, Inc.
+# Copyright:: Copyright 2014-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -34,8 +34,8 @@ describe Chef::Audit::AuditReporter do
 
   describe "#audit_phase_start" do
 
-    it "notifies audit phase start to debug log" do
-      expect(Chef::Log).to receive(:debug).with(/Audit Reporter starting/)
+    it "notifies audit phase start to trace log" do
+      expect(Chef::Log).to receive(:trace).with(/Audit Reporter starting/)
       reporter.audit_phase_start(run_status)
     end
 
@@ -126,8 +126,8 @@ EOM
           let(:response) { double("response", :code => code) }
 
           before do
-            expect(Chef::Log).to receive(:debug).with(/Sending audit report/)
-            expect(Chef::Log).to receive(:debug).with(/Audit Report/)
+            expect(Chef::Log).to receive(:trace).with(/Sending audit report/)
+            expect(Chef::Log).to receive(:trace).with(/Audit Report/)
             allow(error).to receive(:response).and_return(response)
             expect(error).to receive(:respond_to?).with(:response).and_return(true)
           end
@@ -137,7 +137,7 @@ EOM
             let(:code) { "404" }
 
             it "logs that the server doesn't support audit reporting" do
-              expect(Chef::Log).to receive(:debug).with(/Server doesn't support audit reporting/)
+              expect(Chef::Log).to receive(:trace).with(/Server doesn't support audit reporting/)
               reporter.run_completed(node)
             end
           end
@@ -203,12 +203,12 @@ EOM
     context "when auditing is not enabled" do
 
       before do
-        allow(Chef::Log).to receive(:debug)
+        allow(Chef::Log).to receive(:trace)
       end
 
       it "doesn't send reports" do
         expect(reporter).to receive(:auditing_enabled?).and_return(false)
-        expect(Chef::Log).to receive(:debug).with("Audit Reports are disabled. Skipping sending reports.")
+        expect(Chef::Log).to receive(:trace).with("Audit Reports are disabled. Skipping sending reports.")
         reporter.run_completed(node)
       end
 
@@ -217,13 +217,13 @@ EOM
     context "when the run fails before audits" do
 
       before do
-        allow(Chef::Log).to receive(:debug)
+        allow(Chef::Log).to receive(:trace)
       end
 
       it "doesn't send reports" do
         expect(reporter).to receive(:auditing_enabled?).and_return(true)
         expect(reporter).to receive(:run_status).and_return(nil)
-        expect(Chef::Log).to receive(:debug).with("Run failed before audit mode was initialized, not sending audit report to server")
+        expect(Chef::Log).to receive(:trace).with("Run failed before audit mode was initialized, not sending audit report to server")
         reporter.run_completed(node)
       end
 
@@ -313,13 +313,13 @@ EOM
   describe "#audit_phase_complete" do
     include_context "audit data"
 
-    it "notifies audit phase finished to debug log" do
-      expect(Chef::Log).to receive(:debug).with(/Audit Reporter completed/)
+    it "notifies audit phase finished to trace log" do
+      expect(Chef::Log).to receive(:trace).with(/Audit Reporter completed/)
       reporter.audit_phase_complete("Output from audit mode")
     end
 
     it "collects audit data" do
-      ordered_control_groups.each do |_name, group|
+      ordered_control_groups.each_value do |group|
         expect(audit_data).to receive(:add_control_group).with(group)
       end
       reporter.audit_phase_complete("Output from audit mode")
@@ -331,13 +331,13 @@ EOM
 
     let(:error) { double("Exception") }
 
-    it "notifies audit phase failed to debug log" do
-      expect(Chef::Log).to receive(:debug).with(/Audit Reporter failed/)
+    it "notifies audit phase failed to trace log" do
+      expect(Chef::Log).to receive(:trace).with(/Audit Reporter failed/)
       reporter.audit_phase_failed(error, "Output from audit mode")
     end
 
     it "collects audit data" do
-      ordered_control_groups.each do |_name, group|
+      ordered_control_groups.each_value do |group|
         expect(audit_data).to receive(:add_control_group).with(group)
       end
       reporter.audit_phase_failed(error, "Output from audit mode")

data/spec/unit/chef_fs/file_system_spec.rb

@@ -140,7 +140,7 @@ describe Chef::ChefFS::FileSystem do
       it "is empty /y" do
         expect(Chef::ChefFS::FileSystem.resolve_path(fs, "/y").empty?).to be true
       end
-      it 'is not a directory and can\'t be tested /x' do
+      it "is not a directory and can't be tested /x" do
         expect { Chef::ChefFS::FileSystem.resolve_path(fs, "/x").empty? }.to raise_error(NoMethodError)
       end
     end

data/spec/unit/client_spec.rb

@@ -448,7 +448,7 @@ EOM
       end
 
       it "should log and continue on" do
-        expect(Chef::Log).to receive(:debug)
+        expect(logger).to receive(:trace)
         client.load_required_recipe(rest, run_context)
       end
     end
@@ -482,7 +482,7 @@ EOM
         end
 
         it "should not log a warning message" do
-          expect(Chef::Log).not_to receive(:warn)
+          expect(logger).not_to receive(:warn)
           client.do_windows_admin_check
         end
 
@@ -499,7 +499,7 @@ EOM
         end
 
         it "should log a warning message" do
-          expect(Chef::Log).to receive(:warn)
+          expect(logger).to receive(:warn)
           client.do_windows_admin_check
         end
 
@@ -560,7 +560,6 @@ EOM
         expect { client.node_name }.to raise_error(Chef::Exceptions::CannotDetermineNodeName)
       end
     end
-
   end
 
   describe "always attempt to run handlers" do

data/spec/unit/cookbook/metadata_spec.rb

@@ -871,7 +871,7 @@ describe Chef::Cookbook::Metadata do
 
     describe "from_file" do
       it "ignores unknown metadata fields in metadata.rb files" do
-        expect(Chef::Log).to receive(:debug).with(/ignoring method some_spiffy_new_metadata_field/)
+        expect(Chef::Log).to receive(:trace).with(/ignoring method some_spiffy_new_metadata_field/)
         Tempfile.open("metadata.rb") do |f|
           f.write <<-EOF
             some_spiffy_new_metadata_field "stuff its set to"

data/spec/unit/cookbook_loader_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2008-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -87,7 +87,7 @@ describe Chef::CookbookLoader do
     describe "each" do
       it "should allow you to iterate over cookbooks with each" do
         seen = Hash.new
-        cookbook_loader.each do |cookbook_name, cookbook|
+        cookbook_loader.each_key do |cookbook_name|
           seen[cookbook_name] = true
         end
         expect(seen).to have_key("openldap")
@@ -96,7 +96,7 @@ describe Chef::CookbookLoader do
 
       it "should iterate in alphabetical order" do
         seen = Array.new
-        cookbook_loader.each do |cookbook_name, cookbook|
+        cookbook_loader.each_key do |cookbook_name|
           seen << cookbook_name
         end
         expect(seen).to eq %w{angrybash apache2 borken ignorken java name-mismatch openldap preseed supports-platform-constraints}
@@ -206,7 +206,7 @@ describe Chef::CookbookLoader do
 
     it "should have loaded the correct cookbook" do
       seen = Hash.new
-      cookbook_loader.each do |cookbook_name, cookbook|
+      cookbook_loader.each_key do |cookbook_name|
         seen[cookbook_name] = true
       end
       expect(seen).to have_key("openldap")
@@ -234,7 +234,7 @@ describe Chef::CookbookLoader do
 
     it "should not load the other cookbooks" do
       seen = Hash.new
-      cookbook_loader.each do |cookbook_name, cookbook|
+      cookbook_loader.each_key do |cookbook_name|
         seen[cookbook_name] = true
       end
       expect(seen).not_to have_key("apache2")
@@ -272,7 +272,7 @@ describe Chef::CookbookLoader do
 
       it "should load all cookbooks" do
         seen = Hash.new
-        cookbook_loader.each do |cookbook_name, cookbook|
+        cookbook_loader.each_key do |cookbook_name|
           seen[cookbook_name] = true
         end
         expect(seen).to have_key("openldap")

data/spec/unit/cookbook_manifest_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Daniel DeLeo (<dan@chef.io>)
-# Copyright:: Copyright 2015-2016, Chef Software Inc.
+# Copyright:: Copyright 2015-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -162,7 +162,7 @@ describe Chef::CookbookManifest do
       cookbook_manifest_hash = cookbook_manifest.to_hash
 
       expect(cookbook_manifest_hash.keys).to match_array(expected_hash.keys)
-      cookbook_manifest_hash.each do |key, value|
+      cookbook_manifest_hash.each_key do |key|
         expect(cookbook_manifest_hash[key]).to eq(expected_hash[key])
       end
     end

data/spec/unit/cookbook_version_file_specificity_spec.rb

@@ -94,18 +94,11 @@ describe Chef::CookbookVersion, "file specificity" do
 
        # directory adirectory
        {
-         name: "files/anotherfile1.rb",
-         path: "files/root_directory/anotherfile1.rb.root",
-         checksum: "csum-root-directory",
-         specificity: "root_directory",
-       },
-
-       {
-         name: "files/anotherfile1.rb",
-         path: "files/host-examplehost.example.org/adirectory/anotherfile1.rb.host",
-         full_path: "/cookbook-folder/files/host-examplehost.example.org/adirectory/anotherfile1.rb.host",
-         checksum: "csum-host-1",
-         specificity: "host-examplehost.example.org",
+         :name => "files/anotherfile1.rb",
+         :path => "files/host-examplehost.example.org/adirectory/anotherfile1.rb.host",
+         :full_path => "/cookbook-folder/files/host-examplehost.example.org/adirectory/anotherfile1.rb.host",
+         :checksum => "csum-host-1",
+         :specificity => "host-examplehost.example.org",
        },
        {
          :name => "files/anotherfile2.rb",
@@ -490,19 +483,6 @@ describe Chef::CookbookVersion, "file specificity" do
   ## Globbing the relative paths out of the manifest records ##
 
   describe "when globbing for relative file paths based on filespecificity" do
-    it "should return a list of relative paths based on priority preference: root directory" do
-      node = Chef::Node.new
-      node.automatic_attrs[:platform] = "ubuntu"
-      node.automatic_attrs[:platform_version] = "9.10"
-      node.automatic_attrs[:fqdn] = "examplehost.example.org"
-
-      filenames = @cookbook.relative_filenames_in_preferred_directory(node, :files, "root_directory")
-      expect(filenames).not_to be_nil
-      expect(filenames.size).to eq(1)
-
-      expect(filenames.sort).to eq(["anotherfile1.rb.root"])
-    end
-
     it "should return a list of relative paths based on priority preference: host" do
       node = Chef::Node.new
       node.automatic_attrs[:platform] = "ubuntu"