chef 10.16.6 → 10.18.0.rc.1

data/spec/unit/knife/cookbook_site_install_spec.rb

@@ -60,7 +60,6 @@ describe Chef::Knife::CookbookSiteInstall do
 
 
   describe "run" do
-
     it "should return an error if a cookbook name is not provided" do
       @knife.name_args = []
       @knife.ui.should_receive(:error).with("Please specify a cookbook to download and install.")
@@ -91,7 +90,6 @@ describe Chef::Knife::CookbookSiteInstall do
       lambda { @knife.run }.should raise_error(SystemExit)
     end
 
-
     it "should install the specified version if second argument is a three-digit version" do
       @knife.name_args = ["getting-started", "0.1.0"]
       @knife.config[:no_deps] = true
@@ -134,5 +132,17 @@ describe Chef::Knife::CookbookSiteInstall do
       @repo.should_not_receive(:reset_to_default_state)
       @knife.run
     end
+
+    it "should not raise an error if cookbook_path is a string" do
+      @knife.config[:cookbook_path] = @install_path
+      @knife.config[:no_deps] = true
+      @knife.name_args = ["getting-started"]
+      upstream_file = File.join(@install_path, "getting-started.tar.gz")
+      @knife.should_receive(:download_cookbook_to).with(upstream_file)
+      @knife.should_receive(:extract_cookbook).with(upstream_file, "0.3.0")
+      @knife.should_receive(:clear_existing_files).with(File.join(@install_path, "getting-started"))
+      @repo.should_receive(:merge_updates_from).with("getting-started", "0.3.0")
+      lambda { @knife.run }.should_not raise_error
+    end
   end
 end

data/spec/unit/knife/core/bootstrap_context_spec.rb

@@ -56,6 +56,13 @@ describe Chef::Knife::Core::BootstrapContext do
     @context.validation_key.should == IO.read(File.join(CHEF_SPEC_DATA, 'ssl', 'private_key.pem'))
   end
 
+  it "reads the validation key when it contains a ~" do
+    IO.should_receive(:read).with(File.expand_path("my.key", ENV['HOME']))
+    @chef_config = {:validation_key => '~/my.key'}
+    @context = Chef::Knife::Core::BootstrapContext.new(@config, @run_list, @chef_config)
+    @context.validation_key
+  end
+
   it "generates the config file data" do
     expected=<<-EXPECTED
 log_level        :info

data/spec/unit/knife/data_bag_create_spec.rb

@@ -75,6 +75,11 @@ describe Chef::Knife::DataBagCreate do
       @knife.should_receive(:create_object).and_yield(@plain_data)
       data_bag_item = Chef::DataBagItem.from_hash(@enc_data)
       data_bag_item.data_bag("sudoing_admins")
+
+      # Random IV is used each time the data bag item is encrypted, so values
+      # will not be equal if we re-encrypt.
+      Chef::EncryptedDataBagItem.should_receive(:encrypt_data_bag_item).and_return(@enc_data)
+
       @rest.should_receive(:post_rest).with("data", {'name' => 'sudoing_admins'}).ordered
       @rest.should_receive(:post_rest).with("data/sudoing_admins", data_bag_item).ordered
     end

data/spec/unit/knife/data_bag_edit_spec.rb

@@ -59,6 +59,19 @@ describe Chef::Knife::DataBagEdit do
       @enc_edited_data = Chef::EncryptedDataBagItem.encrypt_data_bag_item(@edited_data,
                                                                           @secret)
       Chef::DataBagItem.stub!(:load).with('bag_name', 'item_name').and_return(@enc_data)
+
+      # Random IV is used each time the data bag item is encrypted, so values
+      # will not be equal if we encrypt same value twice.
+      Chef::EncryptedDataBagItem.should_receive(:encrypt_data_bag_item).and_return(@enc_edited_data)
+
+      @secret_file = Tempfile.new("encrypted_data_bag_secret_file_test")
+      @secret_file.puts(@secret)
+      @secret_file.flush
+    end
+
+    after do
+      @secret_file.close
+      @secret_file.unlink
     end
 
     it "decrypts and encrypts via --secret" do

data/spec/unit/knife/data_bag_from_file_spec.rb

@@ -142,6 +142,19 @@ describe Chef::Knife::DataBagFromFile do
       @secret = "abc123SECRET"
       @enc_data = Chef::EncryptedDataBagItem.encrypt_data_bag_item(@plain_data,
                                                                    @secret)
+
+      # Random IV is used each time the data bag item is encrypted, so values
+      # will not be equal if we re-encrypt.
+      Chef::EncryptedDataBagItem.should_receive(:encrypt_data_bag_item).and_return(@enc_data)
+
+      @secret_file = Tempfile.new("encrypted_data_bag_secret_file_test")
+      @secret_file.puts(@secret)
+      @secret_file.flush
+    end
+
+    after do
+      @secret_file.close
+      @secret_file.unlink
     end
 
     it "encrypts values when given --secret" do
@@ -177,7 +190,8 @@ describe Chef::Knife::DataBagFromFile do
     it "prints help if given no arguments" do
       @knife.instance_variable_set(:@name_args, [])
       lambda { @knife.run }.should raise_error(SystemExit)
-      @stdout.string.should match(/^knife data bag from file BAG FILE|FOLDER [FILE|FOLDER..] \(options\)/)
+      expected = 'knife data bag from file BAG FILE|FOLDER [FILE|FOLDER..] (options)'
+      @stdout.string.should include(expected)
     end
   end
 

data/spec/unit/knife/ssh_spec.rb

@@ -197,5 +197,97 @@ describe Chef::Knife::Ssh do
       @knife.session.servers[0].user.should == "locutus"
     end
   end
-end
 
+  describe "#ssh_command" do
+    let(:execution_channel) { double(:execution_channel, :on_data => nil) }
+    let(:session_channel) { double(:session_channel, :request_pty => nil)}
+
+    let(:execution_channel2) { double(:execution_channel, :on_data => nil) }
+    let(:session_channel2) { double(:session_channel, :request_pty => nil)}
+
+    let(:session) { double(:session, :loop => nil) }
+
+    let(:command) { "false" }
+
+    before do
+      execution_channel.
+        should_receive(:on_request).
+        and_yield(nil, double(:data_stream, :read_long => exit_status))
+
+      session_channel.
+        should_receive(:exec).
+        with(command).
+        and_yield(execution_channel, true)
+
+      execution_channel2.
+        should_receive(:on_request).
+        and_yield(nil, double(:data_stream, :read_long => exit_status2))
+
+      session_channel2.
+        should_receive(:exec).
+        with(command).
+        and_yield(execution_channel2, true)
+
+      session.
+        should_receive(:open_channel).
+        and_yield(session_channel).
+        and_yield(session_channel2)
+    end
+
+    context "both connections return 0" do
+      let(:exit_status) { 0 }
+      let(:exit_status2) { 0 }
+
+      it "returns a 0 exit code" do
+        @knife.ssh_command(command, session).should == 0
+      end
+    end
+
+    context "the first connection returns 1 and the second returns 0" do
+      let(:exit_status) { 1 }
+      let(:exit_status2) { 0 }
+
+      it "returns a non-zero exit code" do
+        @knife.ssh_command(command, session).should == 1
+      end
+    end
+
+    context "the first connection returns 1 and the second returns 2" do
+      let(:exit_status) { 1 }
+      let(:exit_status2) { 2 }
+
+      it "returns a non-zero exit code" do
+        @knife.ssh_command(command, session).should == 2
+      end
+    end
+  end
+
+  describe "#run" do
+    before do
+      @query = Chef::Search::Query.new
+      @query.should_receive(:search).and_return([[@node_foo]])
+      Chef::Search::Query.stub!(:new).and_return(@query)
+      @knife.stub(:ssh_command).and_return(exit_code)
+      @knife.name_args = ['*:*', 'false']
+      @knife.config[:manual] = false
+    end
+
+    context "with an error" do
+      let(:exit_code) { 1 }
+
+      it "should exit with a non-zero exit code" do
+        @knife.should_receive(:exit).with(exit_code)
+        @knife.run
+      end
+    end
+
+    context "with no error" do
+      let(:exit_code) { 0 }
+
+      it "should not exit" do
+        @knife.should_not_receive(:exit)
+        @knife.run
+      end
+    end
+  end
+end

data/spec/unit/provider/package/yum_spec.rb

@@ -34,7 +34,8 @@ describe Chef::Provider::Package::Yum do
       :package_available? => true,
       :version_available? => true,
       :allow_multi_install => [ "kernel" ],
-      :package_repository => "base" 
+      :package_repository => "base",
+      :disable_extra_repo_control => true
     )
     Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
     @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
@@ -92,6 +93,7 @@ describe Chef::Provider::Package::Yum do
           end
         end
         @yum_cache.stub!(:package_available?).and_return(true)
+        @yum_cache.stub!(:disable_extra_repo_control).and_return(true)
         Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
         @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
         @provider.load_current_resource
@@ -125,6 +127,7 @@ describe Chef::Provider::Package::Yum do
           nil
         end
         @yum_cache.stub!(:package_available?).and_return(true)
+        @yum_cache.stub!(:disable_extra_repo_control).and_return(true)
         Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
         @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
         # annoying side effect of the fun stub'ing above
@@ -155,6 +158,7 @@ describe Chef::Provider::Package::Yum do
           nil
         end
         @yum_cache.stub!(:package_available?).and_return(true)
+        @yum_cache.stub!(:disable_extra_repo_control).and_return(true)
         Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
         @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
         @provider.load_current_resource
@@ -189,6 +193,7 @@ describe Chef::Provider::Package::Yum do
           end
         end.and_return("something")
         @yum_cache.stub!(:package_available?).and_return(true)
+        @yum_cache.stub!(:disable_extra_repo_control).and_return(true)
         Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
         @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
         @provider.load_current_resource
@@ -209,6 +214,24 @@ describe Chef::Provider::Package::Yum do
       @provider.load_current_resource
     end
 
+    it "should detect --enablerepo or --disablerepo when passed among options, collect them preserving order and notify the yum cache" do
+      @new_resource.stub!(:options).and_return("--stuff --enablerepo=foo --otherthings --disablerepo=a,b,c  --enablerepo=bar")
+      @yum_cache.should_receive(:enable_extra_repo_control).with("--enablerepo=foo --disablerepo=a,b,c --enablerepo=bar")
+      @provider.load_current_resource
+    end
+
+    it "should let the yum cache know extra repos are disabled if --enablerepo or --disablerepo aren't among options" do
+      @new_resource.stub!(:options).and_return("--stuff --otherthings")
+      @yum_cache.should_receive(:disable_extra_repo_control)
+      @provider.load_current_resource
+    end
+
+    it "should let the yum cache know extra repos are disabled if options aren't set" do
+      @new_resource.stub!(:options).and_return(nil)
+      @yum_cache.should_receive(:disable_extra_repo_control)
+      @provider.load_current_resource
+    end
+
     it "should search provides if package name can't be found then set package_name to match" do
       @yum_cache = mock(
         'Chef::Provider::Yum::YumCache',
@@ -217,7 +240,8 @@ describe Chef::Provider::Package::Yum do
         :installed_version => "1.2.4-11.18.el5",
         :candidate_version => "1.2.4-11.18.el5",
         :package_available? => false,
-        :version_available? => true
+        :version_available? => true,
+        :disable_extra_repo_control => true
       )
       Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
       pkg = Chef::Provider::Package::Yum::RPMPackage.new("test-package", "1.2.4-11.18.el5", "x86_64", [])
@@ -235,7 +259,8 @@ describe Chef::Provider::Package::Yum do
         :installed_version => "1.2.4-11.18.el5",
         :candidate_version => "1.2.4-11.18.el5",
         :package_available? => false,
-        :version_available? => true
+        :version_available? => true,
+        :disable_extra_repo_control => true
       )
       Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
       pkg_x = Chef::Provider::Package::Yum::RPMPackage.new("test-package-x", "1.2.4-11.18.el5", "x86_64", [])
@@ -255,7 +280,8 @@ describe Chef::Provider::Package::Yum do
         :installed_version => "1.2.4-11.18.el5",
         :candidate_version => "1.2.4-11.18.el5",
         :package_available? => false,
-        :version_available? => true
+        :version_available? => true,
+        :disable_extra_repo_control => true
       )
       Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
       @yum_cache.should_receive(:packages_from_require).twice.and_return([])
@@ -272,7 +298,8 @@ describe Chef::Provider::Package::Yum do
         :installed_version => "1.2.4-11.18.el5",
         :candidate_version => "1.2.4-11.18.el5",
         :package_available? => false,
-        :version_available? => true
+        :version_available? => true,
+        :disable_extra_repo_control => true
       )
       Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
       @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
@@ -295,7 +322,8 @@ describe Chef::Provider::Package::Yum do
         :installed_version => "1.2.4-11.18.el5",
         :candidate_version => "1.2.4-11.18.el5",
         :package_available? => false,
-        :version_available? => true
+        :version_available? => true,
+        :disable_extra_repo_control => true
       )
       Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
       @yum_cache.should_receive(:packages_from_require).twice.and_return([])
@@ -363,7 +391,8 @@ describe Chef::Provider::Package::Yum do
         :installed_version => "1.2.4-11.18.el5",
         :candidate_version => "1.2.4-11.18.el5_2.3",
         :package_available? => true,
-        :version_available? => nil
+        :version_available? => nil,
+        :disable_extra_repo_control => true
       )
       Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
       @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
@@ -380,7 +409,8 @@ describe Chef::Provider::Package::Yum do
         :candidate_version => "1.2.4-11.15.el5",
         :package_available? => true,
         :version_available? => true,
-        :allow_multi_install => [ "kernel" ]
+        :allow_multi_install => [ "kernel" ],
+        :disable_extra_repo_control => true
       )
       Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
       @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
@@ -398,7 +428,8 @@ describe Chef::Provider::Package::Yum do
         :package_available? => true,
         :version_available? => true,
         :allow_multi_install => [ "cups" ],
-        :package_repository => "base"
+        :package_repository => "base",
+        :disable_extra_repo_control => true
       )
       Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
       @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
@@ -420,7 +451,8 @@ describe Chef::Provider::Package::Yum do
         :package_available? => true,
         :version_available? => true,
         :allow_multi_install => [],
-        :package_repository => "base"
+        :package_repository => "base",
+        :disable_extra_repo_control => true
       )
       Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
       @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
@@ -485,7 +517,8 @@ describe Chef::Provider::Package::Yum do
         :candidate_version => "1.2.4-11.15.el5",
         :package_available? => true,
         :version_available? => true,
-        :allow_multi_install => [ "kernel" ]
+        :allow_multi_install => [ "kernel" ],
+        :disable_extra_repo_control => true
       )
       Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
       @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
@@ -1609,6 +1642,12 @@ EOF
       @yc.refresh
     end
 
+    it "should pass extra_repo_control args to yum-dump.py" do
+      @yc.enable_extra_repo_control("--enablerepo=foo --disablerepo=bar")
+      @yc.should_receive(:popen4).with(%r{^/usr/bin/python .*/yum-dump.py --options --installed-provides --enablerepo=foo --disablerepo=bar$}, :waitlast=>true)
+      @yc.refresh
+    end
+
     it "should warn about invalid data with too many separators" do
       @yc.stub!(:popen4).and_yield(@pid, @stdin, @stdout_bad_separators, @stderr).and_return(@status)
       Chef::Log.should_receive(:warn).exactly(3).times.with(%r{Problem parsing})
@@ -1788,4 +1827,33 @@ EOF
     end
   end
 
+  describe "enable_extra_repo_control" do
+    it "should set @extra_repo_control to arg" do
+      @yc.enable_extra_repo_control("--enablerepo=test")
+      @yc.extra_repo_control.should be == "--enablerepo=test"
+    end
+
+    it "should call reload once when set to flag cache for update" do
+      @yc.should_receive(:reload).once
+      @yc.enable_extra_repo_control("--enablerepo=test")
+      @yc.enable_extra_repo_control("--enablerepo=test")
+    end
+  end
+
+  describe "disable_extra_repo_control" do
+    it "should set @extra_repo_control to nil" do
+      @yc.enable_extra_repo_control("--enablerepo=test")
+      @yc.disable_extra_repo_control
+      @yc.extra_repo_control.should be == nil
+    end
+
+    it "should call reload once when cleared to flag cache for update" do
+      @yc.should_receive(:reload).once
+      @yc.enable_extra_repo_control("--enablerepo=test")
+      @yc.should_receive(:reload).once
+      @yc.disable_extra_repo_control
+      @yc.disable_extra_repo_control
+    end
+  end
+
 end

data/spec/unit/resource/log_spec.rb

@@ -38,6 +38,15 @@ describe Chef::Resource::Log do
   it "should allow you to set a log string" do
     @resource.name.should == @log_str
   end
+
+  it "should set the message to the first argument to new" do
+    @resource.message.should == @log_str
+  end
+
+  it "should accept a string for the log message" do
+    @resource.message "this is different"
+    @resource.message.should == "this is different"
+  end
   
   it "should accept a vaild level option" do
     @resource.level :debug