chef 16.2.73-universal-mingw32 → 16.4.41-universal-mingw32

data/spec/integration/knife/common_options_spec.rb

@@ -125,12 +125,12 @@ describe "knife common options", :workstation do
 
     context "when the default port (8889) is already bound" do
       before :each do
-        begin
-          @server = ChefZero::Server.new(host: "localhost", port: 8889)
-          @server.start_background
-        rescue Errno::EADDRINUSE
-          # OK.  Don't care who has it in use, as long as *someone* does.
-        end
+
+        @server = ChefZero::Server.new(host: "localhost", port: 8889)
+        @server.start_background
+      rescue Errno::EADDRINUSE
+        # OK.  Don't care who has it in use, as long as *someone* does.
+
       end
       after :each do
         @server.stop if @server
@@ -144,12 +144,12 @@ describe "knife common options", :workstation do
 
     context "when port 9999 is already bound" do
       before :each do
-        begin
-          @server = ChefZero::Server.new(host: "localhost", port: 9999)
-          @server.start_background
-        rescue Errno::EADDRINUSE
-          # OK.  Don't care who has it in use, as long as *someone* does.
-        end
+
+        @server = ChefZero::Server.new(host: "localhost", port: 9999)
+        @server.start_background
+      rescue Errno::EADDRINUSE
+        # OK.  Don't care who has it in use, as long as *someone* does.
+
       end
       after :each do
         @server.stop if @server

data/spec/integration/knife/config_get_profile_spec.rb

@@ -22,92 +22,93 @@ describe "knife config get-profile", :workstation do
   include KnifeSupport
 
   include_context "default config options"
-  include_context "with a chef repo"
 
   let(:cmd_args) { [] }
 
-  subject do
-    cmd = knife("config", "get-profile", *cmd_args, instance_filter: lambda { |instance|
-      # Fake the failsafe check because this command doesn't actually process knife.rb.
-      $__KNIFE_INTEGRATION_FAILSAFE_CHECK << " ole"
-    })
-    cmd.stdout
-  end
-
-  around do |ex|
-    # Store and reset the value of some env vars.
-    old_chef_home = ENV["CHEF_HOME"]
-    old_knife_home = ENV["KNIFE_HOME"]
-    old_home = ENV["HOME"]
-    old_wd = Dir.pwd
-    ChefConfig::PathHelper.per_tool_home_environment = "KNIFE_HOME"
-    # Clear these out because they are cached permanently.
-    ChefConfig::PathHelper.class_exec { remove_class_variable(:@@home_dir) }
-    Chef::Knife::ConfigGetProfile.reset_config_loader!
-    begin
-      ex.run
-    ensure
-      ENV["CHEF_HOME"] = old_chef_home
-      ENV["KNIFE_HOME"] = old_knife_home
-      ENV["HOME"] = old_home
-      Dir.chdir(old_wd)
-      ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
-      ChefConfig::PathHelper.per_tool_home_environment = nil
+  when_the_repository("has a custom env") do
+    subject do
+      cmd = knife("config", "get-profile", *cmd_args, instance_filter: lambda { |instance|
+        # Fake the failsafe check because this command doesn't actually process knife.rb.
+        $__KNIFE_INTEGRATION_FAILSAFE_CHECK << " ole"
+      })
+      cmd.stdout
     end
-  end
-
-  before do
-    # Always run from the temp folder. This can't be in the `around` block above
-    # because it has to run after the before set in the "with a chef repo" shared context.
-    directory("repo")
-    Dir.chdir(path_to("repo"))
-    ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
-    ENV["HOME"] = path_to(".")
-  end
-
-  context "with no configuration" do
-    it { is_expected.to eq "default\n" }
-  end
 
-  context "with --profile" do
-    let(:cmd_args) { %w{--profile production} }
-    it { is_expected.to eq "production\n" }
-  end
-
-  context "with an environment variable" do
     around do |ex|
-      old_chef_profile = ENV["CHEF_PROFILE"]
+      # Store and reset the value of some env vars.
+      old_chef_home = ENV["CHEF_HOME"]
+      old_knife_home = ENV["KNIFE_HOME"]
+      old_home = ENV["HOME"]
+      old_wd = Dir.pwd
+      ChefConfig::PathHelper.per_tool_home_environment = "KNIFE_HOME"
+      # Clear these out because they are cached permanently.
+      ChefConfig::PathHelper.class_exec { remove_class_variable(:@@home_dir) }
+      Chef::Knife::ConfigGetProfile.reset_config_loader!
       begin
-        ENV["CHEF_PROFILE"] = "staging"
         ex.run
       ensure
-        ENV["CHEF_PROFILE"] = old_chef_profile
+        ENV["CHEF_HOME"] = old_chef_home
+        ENV["KNIFE_HOME"] = old_knife_home
+        ENV["HOME"] = old_home
+        Dir.chdir(old_wd)
+        ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
+        ChefConfig::PathHelper.per_tool_home_environment = nil
       end
     end
 
-    it { is_expected.to eq "staging\n" }
-  end
+    before do
+      # Always run from the temp folder. This can't be in the `around` block above
+      # because it has to run after the before set in the "with a chef repo" shared context.
+      directory("repo")
+      Dir.chdir(path_to("repo"))
+      ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
+      ENV["HOME"] = path_to(".")
+    end
 
-  context "with a context file" do
-    before { file(".chef/context", "development\n") }
-    it { is_expected.to eq "development\n" }
-  end
+    context "with no configuration" do
+      it { is_expected.to eq "default\n" }
+    end
 
-  context "with a context file under $CHEF_HOME" do
-    before do
-      file("chefhome/.chef/context", "other\n")
-      ENV["CHEF_HOME"] = path_to("chefhome")
+    context "with --profile" do
+      let(:cmd_args) { %w{--profile production} }
+      it { is_expected.to eq "production\n" }
     end
 
-    it { is_expected.to eq "other\n" }
-  end
+    context "with an environment variable" do
+      around do |ex|
+        old_chef_profile = ENV["CHEF_PROFILE"]
+        begin
+          ENV["CHEF_PROFILE"] = "staging"
+          ex.run
+        ensure
+          ENV["CHEF_PROFILE"] = old_chef_profile
+        end
+      end
 
-  context "with a context file under $KNIFE_HOME" do
-    before do
-      file("knifehome/.chef/context", "other\n")
-      ENV["KNIFE_HOME"] = path_to("knifehome")
+      it { is_expected.to eq "staging\n" }
+    end
+
+    context "with a context file" do
+      before { file(".chef/context", "development\n") }
+      it { is_expected.to eq "development\n" }
     end
 
-    it { is_expected.to eq "other\n" }
+    context "with a context file under $CHEF_HOME" do
+      before do
+        file("chefhome/.chef/context", "other\n")
+        ENV["CHEF_HOME"] = path_to("chefhome")
+      end
+
+      it { is_expected.to eq "other\n" }
+    end
+
+    context "with a context file under $KNIFE_HOME" do
+      before do
+        file("knifehome/.chef/context", "other\n")
+        ENV["KNIFE_HOME"] = path_to("knifehome")
+      end
+
+      it { is_expected.to eq "other\n" }
+    end
   end
 end

data/spec/integration/knife/config_get_spec.rb

@@ -22,170 +22,171 @@ describe "knife config get", :workstation do
   include KnifeSupport
 
   include_context "default config options"
-  include_context "with a chef repo"
 
   let(:cmd_args) { [] }
 
-  subject do
-    cmd = knife("config", "get", *cmd_args, instance_filter: lambda { |instance|
-      # Clear the stub set up in KnifeSupport.
-      allow(File).to receive(:file?).and_call_original
-      # Lies, damn lies, and config files. We need to allow normal config loading
-      # behavior to be able to test stuff.
-      instance.config.delete(:config_file)
-      $__KNIFE_INTEGRATION_FAILSAFE_CHECK << " ole"
-    })
-    cmd.stdout
-  end
+  when_the_repository("has a custom env") do
+    subject do
+      cmd = knife("config", "get", *cmd_args, instance_filter: lambda { |instance|
+        # Clear the stub set up in KnifeSupport.
+        allow(File).to receive(:file?).and_call_original
+        # Lies, damn lies, and config files. We need to allow normal config loading
+        # behavior to be able to test stuff.
+        instance.config.delete(:config_file)
+        $__KNIFE_INTEGRATION_FAILSAFE_CHECK << " ole"
+      })
+      cmd.stdout
+    end
 
-  around do |ex|
-    # Store and reset the value of some env vars.
-    old_chef_home = ENV["CHEF_HOME"]
-    old_knife_home = ENV["KNIFE_HOME"]
-    old_home = ENV["HOME"]
-    old_wd = Dir.pwd
-    ChefConfig::PathHelper.per_tool_home_environment = "KNIFE_HOME"
-    # Clear these out because they are cached permanently.
-    ChefConfig::PathHelper.class_exec { remove_class_variable(:@@home_dir) }
-    Chef::Knife::ConfigGet.reset_config_loader!
-    begin
-      ex.run
-    ensure
-      ENV["CHEF_HOME"] = old_chef_home
-      ENV["KNIFE_HOME"] = old_knife_home
-      ENV["HOME"] = old_home
-      Dir.chdir(old_wd)
+    around do |ex|
+      # Store and reset the value of some env vars.
+      old_chef_home = ENV["CHEF_HOME"]
+      old_knife_home = ENV["KNIFE_HOME"]
+      old_home = ENV["HOME"]
+      old_wd = Dir.pwd
+      ChefConfig::PathHelper.per_tool_home_environment = "KNIFE_HOME"
+      # Clear these out because they are cached permanently.
+      ChefConfig::PathHelper.class_exec { remove_class_variable(:@@home_dir) }
+      Chef::Knife::ConfigGet.reset_config_loader!
+      begin
+        ex.run
+      ensure
+        ENV["CHEF_HOME"] = old_chef_home
+        ENV["KNIFE_HOME"] = old_knife_home
+        ENV["HOME"] = old_home
+        Dir.chdir(old_wd)
+        ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
+        ChefConfig::PathHelper.per_tool_home_environment = nil
+      end
+    end
+
+    before do
+      # Always run from the temp folder. This can't be in the `around` block above
+      # because it has to run after the before set in the "with a chef repo" shared context.
+      directory("repo")
+      Dir.chdir(path_to("repo"))
       ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
-      ChefConfig::PathHelper.per_tool_home_environment = nil
+      ENV["HOME"] = path_to(".")
     end
-  end
 
-  before do
-    # Always run from the temp folder. This can't be in the `around` block above
-    # because it has to run after the before set in the "with a chef repo" shared context.
-    directory("repo")
-    Dir.chdir(path_to("repo"))
-    ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
-    ENV["HOME"] = path_to(".")
-  end
+    context "with a global knife.rb" do
+      before { file(".chef/knife.rb", "node_name 'one'\n") }
 
-  context "with a global knife.rb" do
-    before { file(".chef/knife.rb", "node_name 'one'\n") }
+      it { is_expected.to match(%r{^Loading from configuration file .*/#{File.basename(path_to("."))}/.chef/knife.rb$}) }
+      it { is_expected.to match(/^node_name:\s+one$/) }
+    end
 
-    it { is_expected.to match(%r{^Loading from configuration file .*/#{File.basename(path_to("."))}/.chef/knife.rb$}) }
-    it { is_expected.to match(/^node_name:\s+one$/) }
-  end
+    context "with a repo knife.rb" do
+      before { file("repo/.chef/knife.rb", "node_name 'two'\n") }
 
-  context "with a repo knife.rb" do
-    before { file("repo/.chef/knife.rb", "node_name 'two'\n") }
+      it { is_expected.to match(%r{^Loading from configuration file .*/#{File.basename(path_to("."))}/repo/.chef/knife.rb$}) }
+      it { is_expected.to match(/^node_name:\s+two$/) }
+    end
 
-    it { is_expected.to match(%r{^Loading from configuration file .*/#{File.basename(path_to("."))}/repo/.chef/knife.rb$}) }
-    it { is_expected.to match(/^node_name:\s+two$/) }
-  end
+    context "with both knife.rb" do
+      before do
+        file(".chef/knife.rb", "node_name 'one'\n")
+        file("repo/.chef/knife.rb", "node_name 'two'\n")
+      end
 
-  context "with both knife.rb" do
-    before do
-      file(".chef/knife.rb", "node_name 'one'\n")
-      file("repo/.chef/knife.rb", "node_name 'two'\n")
+      it { is_expected.to match(%r{^Loading from configuration file .*/#{File.basename(path_to("."))}/repo/.chef/knife.rb$}) }
+      it { is_expected.to match(/^node_name:\s+two$/) }
     end
 
-    it { is_expected.to match(%r{^Loading from configuration file .*/#{File.basename(path_to("."))}/repo/.chef/knife.rb$}) }
-    it { is_expected.to match(/^node_name:\s+two$/) }
-  end
+    context "with a credentials file" do
+      before { file(".chef/credentials", "[default]\nclient_name = \"three\"\n") }
 
-  context "with a credentials file" do
-    before { file(".chef/credentials", "[default]\nclient_name = \"three\"\n") }
+      it { is_expected.to match(%r{^Loading from credentials file .*/#{File.basename(path_to("."))}/.chef/credentials$}) }
+      it { is_expected.to match(/^node_name:\s+three$/) }
+    end
 
-    it { is_expected.to match(%r{^Loading from credentials file .*/#{File.basename(path_to("."))}/.chef/credentials$}) }
-    it { is_expected.to match(/^node_name:\s+three$/) }
-  end
+    context "with a credentials file and knife.rb" do
+      before do
+        file(".chef/knife.rb", "node_name 'one'\n")
+        file(".chef/credentials", "[default]\nclient_name = \"three\"\n")
+      end
 
-  context "with a credentials file and knife.rb" do
-    before do
-      file(".chef/knife.rb", "node_name 'one'\n")
-      file(".chef/credentials", "[default]\nclient_name = \"three\"\n")
+      it { is_expected.to match(%r{^Loading from configuration file .*/#{File.basename(path_to("."))}/.chef/knife.rb$}) }
+      it { is_expected.to match(%r{^Loading from credentials file .*/#{File.basename(path_to("."))}/.chef/credentials$}) }
+      it { is_expected.to match(/^node_name:\s+one$/) }
     end
 
-    it { is_expected.to match(%r{^Loading from configuration file .*/#{File.basename(path_to("."))}/.chef/knife.rb$}) }
-    it { is_expected.to match(%r{^Loading from credentials file .*/#{File.basename(path_to("."))}/.chef/credentials$}) }
-    it { is_expected.to match(/^node_name:\s+one$/) }
-  end
+    context "with a config dot d files" do
+      before { file(".chef/config.d/abc.rb", "node_name 'one'\n") }
 
-  context "with a config dot d files" do
-    before { file(".chef/config.d/abc.rb", "node_name 'one'\n") }
+      it { is_expected.to match(%r{^Loading from .d/ configuration file .*/#{File.basename(path_to("."))}/.chef/config.d/abc.rb$}) }
+      it { is_expected.to match(/^node_name:\s+one$/) }
+    end
 
-    it { is_expected.to match(%r{^Loading from .d/ configuration file .*/#{File.basename(path_to("."))}/.chef/config.d/abc.rb$}) }
-    it { is_expected.to match(/^node_name:\s+one$/) }
-  end
+    context "with a credentials file and CHEF_HOME" do
+      before do
+        file(".chef/credentials", "[default]\nclient_name = \"three\"\n")
+        file("foo/.chef/credentials", "[default]\nclient_name = \"four\"\n")
+        ENV["CHEF_HOME"] = path_to("foo")
+      end
 
-  context "with a credentials file and CHEF_HOME" do
-    before do
-      file(".chef/credentials", "[default]\nclient_name = \"three\"\n")
-      file("foo/.chef/credentials", "[default]\nclient_name = \"four\"\n")
-      ENV["CHEF_HOME"] = path_to("foo")
+      it { is_expected.to match(%r{^Loading from credentials file .*/#{File.basename(path_to("."))}/foo/.chef/credentials$}) }
+      it { is_expected.to match(/^node_name:\s+four$/) }
     end
 
-    it { is_expected.to match(%r{^Loading from credentials file .*/#{File.basename(path_to("."))}/foo/.chef/credentials$}) }
-    it { is_expected.to match(/^node_name:\s+four$/) }
-  end
+    context "with a credentials file and KNIFE_HOME" do
+      before do
+        file(".chef/credentials", "[default]\nclient_name = \"three\"\n")
+        file("bar/.chef/credentials", "[default]\nclient_name = \"four\"\n")
+        ENV["KNIFE_HOME"] = path_to("bar")
+      end
 
-  context "with a credentials file and KNIFE_HOME" do
-    before do
-      file(".chef/credentials", "[default]\nclient_name = \"three\"\n")
-      file("bar/.chef/credentials", "[default]\nclient_name = \"four\"\n")
-      ENV["KNIFE_HOME"] = path_to("bar")
+      it { is_expected.to match(%r{^Loading from credentials file .*/#{File.basename(path_to("."))}/bar/.chef/credentials$}) }
+      it { is_expected.to match(/^node_name:\s+four$/) }
     end
 
-    it { is_expected.to match(%r{^Loading from credentials file .*/#{File.basename(path_to("."))}/bar/.chef/credentials$}) }
-    it { is_expected.to match(/^node_name:\s+four$/) }
-  end
-
-  context "with single argument" do
-    let(:cmd_args) { %w{node_name} }
-    before { file(".chef/credentials", "[default]\nclient_name = \"three\"\n") }
+    context "with single argument" do
+      let(:cmd_args) { %w{node_name} }
+      before { file(".chef/credentials", "[default]\nclient_name = \"three\"\n") }
 
-    it { is_expected.to match(/^node_name:\s+three\Z/) }
-  end
+      it { is_expected.to match(/^node_name:\s+three\Z/) }
+    end
 
-  context "with two arguments" do
-    let(:cmd_args) { %w{node_name client_key} }
-    before { file(".chef/credentials", "[default]\nclient_name = \"three\"\nclient_key = \"three.pem\"") }
+    context "with two arguments" do
+      let(:cmd_args) { %w{node_name client_key} }
+      before { file(".chef/credentials", "[default]\nclient_name = \"three\"\nclient_key = \"three.pem\"") }
 
-    it { is_expected.to match(%r{^client_key:\s+\S*/.chef/three.pem\nnode_name:\s+three\Z}) }
-  end
+      it { is_expected.to match(%r{^client_key:\s+\S*/.chef/three.pem\nnode_name:\s+three\Z}) }
+    end
 
-  context "with a dotted argument" do
-    let(:cmd_args) { %w{knife.ssh_user} }
-    before { file(".chef/credentials", "[default]\nclient_name = \"three\"\n[default.knife]\nssh_user = \"foo\"\n") }
+    context "with a dotted argument" do
+      let(:cmd_args) { %w{knife.ssh_user} }
+      before { file(".chef/credentials", "[default]\nclient_name = \"three\"\n[default.knife]\nssh_user = \"foo\"\n") }
 
-    it { is_expected.to match(/^knife.ssh_user:\s+foo\Z/) }
-  end
+      it { is_expected.to match(/^knife.ssh_user:\s+foo\Z/) }
+    end
 
-  context "with regex argument" do
-    let(:cmd_args) { %w{/name/} }
-    before { file(".chef/credentials", "[default]\nclient_name = \"three\"\n") }
+    context "with regex argument" do
+      let(:cmd_args) { %w{/name/} }
+      before { file(".chef/credentials", "[default]\nclient_name = \"three\"\n") }
 
-    it { is_expected.to match(/^node_name:\s+three\Z/) }
-  end
+      it { is_expected.to match(/^node_name:\s+three\Z/) }
+    end
 
-  context "with --all" do
-    let(:cmd_args) { %w{-a /key_contents/} }
-    before { file(".chef/credentials", "[default]\nclient_name = \"three\"\n") }
+    context "with --all" do
+      let(:cmd_args) { %w{-a /key_contents/} }
+      before { file(".chef/credentials", "[default]\nclient_name = \"three\"\n") }
 
-    it { is_expected.to match(/^client_key_contents:\s+\nvalidation_key_contents:\s+\Z/) }
-  end
+      it { is_expected.to match(/^client_key_contents:\s+\nvalidation_key_contents:\s+\Z/) }
+    end
 
-  context "with --raw" do
-    let(:cmd_args) { %w{-r node_name} }
-    before { file(".chef/credentials", "[default]\nclient_name = \"three\"\n") }
+    context "with --raw" do
+      let(:cmd_args) { %w{-r node_name} }
+      before { file(".chef/credentials", "[default]\nclient_name = \"three\"\n") }
 
-    it { is_expected.to eq("three\n") }
-  end
+      it { is_expected.to eq("three\n") }
+    end
 
-  context "with --format=json" do
-    let(:cmd_args) { %w{--format=json node_name} }
-    before { file(".chef/credentials", "[default]\nclient_name = \"three\"\n") }
+    context "with --format=json" do
+      let(:cmd_args) { %w{--format=json node_name} }
+      before { file(".chef/credentials", "[default]\nclient_name = \"three\"\n") }
 
-    it { expect(JSON.parse(subject)).to eq({ "node_name" => "three" }) }
+      it { expect(JSON.parse(subject)).to eq({ "node_name" => "three" }) }
+    end
   end
 end