chef 11.6.2 → 11.8.0.rc.1

data/spec/unit/daemon_spec.rb

@@ -20,7 +20,6 @@ require 'ostruct'
 
 describe Chef::Daemon do
   before do
-    @original_config = Chef::Config.configuration
     if windows?
       mock_struct = #Struct::Passwd.new(nil, nil, 111, 111)
       mock_struct = OpenStruct.new(:uid => 2342, :gid => 2342)
@@ -33,42 +32,6 @@ describe Chef::Daemon do
     end
   end
 
-  after do
-    Chef::Config.configuration.replace(@original_config)
-  end
-
-  describe ".running?" do
-
-    before do
-      Chef::Daemon.name = "spec"
-    end
-
-    describe "when a pid file exists" do
-
-      before do
-        Chef::Daemon.stub!(:pid_from_file).and_return(1337)
-      end
-
-      it "should check that there is a process matching the pidfile" do
-        Process.should_receive(:kill).with(0, 1337)
-        Chef::Daemon.running?
-      end
-
-    end
-
-    describe "when the pid file is nonexistent" do
-
-      before do
-        Chef::Daemon.stub!(:pid_from_file).and_return(nil)
-      end
-
-      it "should return false" do
-        Chef::Daemon.running?.should be_false
-      end
-
-    end
-  end
-
   describe ".pid_file" do
 
     describe "when the pid_file option has been set" do
@@ -77,10 +40,6 @@ describe Chef::Daemon do
         Chef::Config[:pid_file] = "/var/run/chef/chef-client.pid"
       end
 
-      after do
-        Chef::Config.configuration.replace(@original_config)
-      end
-
       it "should return the supplied value" do
         Chef::Daemon.pid_file.should eql("/var/run/chef/chef-client.pid")
       end
@@ -89,7 +48,6 @@ describe Chef::Daemon do
     describe "without the pid_file option set" do
 
       before do
-        Chef::Config[:pid_file] = nil
         Chef::Daemon.name = "chef-client"
       end
 
@@ -112,92 +70,6 @@ describe Chef::Daemon do
     end
   end
 
-  describe ".save_pid_file" do
-
-    before do
-      Process.stub!(:pid).and_return(1337)
-      Chef::Config[:pid_file] = "/var/run/chef/chef-client.pid"
-      Chef::Application.stub!(:fatal!).and_return(true)
-      @f_mock = mock(File, { :print => true, :close => true, :write => true })
-      File.stub!(:open).with("/var/run/chef/chef-client.pid", "w").and_yield(@f_mock)
-    end
-
-    it "should try and create the parent directory" do
-      FileUtils.should_receive(:mkdir_p).with("/var/run/chef")
-      Chef::Daemon.save_pid_file
-    end
-
-    it "should open the pid file for writing" do
-      File.should_receive(:open).with("/var/run/chef/chef-client.pid", "w")
-      Chef::Daemon.save_pid_file
-    end
-
-    it "should write the pid, converted to string, to the pid file" do
-      @f_mock.should_receive(:write).with("1337").once.and_return(true)
-      Chef::Daemon.save_pid_file
-    end
-
-  end
-
-  describe ".remove_pid_file" do
-    before do
-      Chef::Config[:pid_file] = "/var/run/chef/chef-client.pid"
-    end
-
-    describe "when the pid file exists" do
-
-      before do
-        File.stub!(:exists?).with("/var/run/chef/chef-client.pid").and_return(true)
-      end
-
-      it "should remove the file" do
-        FileUtils.should_receive(:rm).with("/var/run/chef/chef-client.pid")
-        Chef::Daemon.remove_pid_file
-      end
-
-
-    end
-
-    describe "when the pid file exists and the process is forked" do
-
-      before do
-        File.stub!(:exists?).with("/var/run/chef/chef-client.pid").and_return(true)
-        Chef::Daemon.stub!(:forked?) { true }
-      end
-
-      it "should not remove the file" do
-        FileUtils.should_not_receive(:rm)
-        Chef::Daemon.remove_pid_file
-      end
-
-    end
-
-    describe "when the pid file exists and the process is not forked" do
-      before do
-        File.stub!(:exists?).with("/var/run/chef/chef-client.pid").and_return(true)
-        Chef::Daemon.stub!(:forked?) { false }
-      end
-
-      it "should remove the file" do
-        FileUtils.should_receive(:rm)
-        Chef::Daemon.remove_pid_file
-      end
-    end
-
-    describe "when the pid file does not exist" do
-
-      before do
-        File.stub!(:exists?).with("/var/run/chef/chef-client.pid").and_return(false)
-      end
-
-      it "should not remove the file" do
-        FileUtils.should_not_receive(:rm)
-        Chef::Daemon.remove_pid_file
-      end
-
-    end
-  end
-
   describe ".change_privilege" do
 
     before do
@@ -230,10 +102,6 @@ describe Chef::Daemon do
     end
 
     describe "when just the user option is supplied" do
-      before do
-        Chef::Config[:group] = nil
-      end
-
       it "should log an appropriate info message" do
         Chef::Log.should_receive(:info).with("About to change privilege to aj")
         Chef::Daemon.change_privilege

data/spec/unit/data_bag_item_spec.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -130,7 +130,7 @@ describe Chef::DataBagItem do
   end
 
   describe "to_hash" do
-    before(:each) do 
+    before(:each) do
       @data_bag_item.data_bag("still_lost")
       @data_bag_item.raw_data = { "id" => "whoa", "i_know" => "kung_fu" }
       @to_hash = @data_bag_item.to_hash
@@ -197,7 +197,7 @@ describe Chef::DataBagItem do
     before do
       @rest = mock("Chef::REST")
       Chef::REST.stub!(:new).and_return(@rest)
-      @data_bag_item['id'] = "heart of darkness" 
+      @data_bag_item['id'] = "heart of darkness"
       raw_data = {"id" => "heart_of_darkness", "author" => "Conrad"}
       @data_bag_item.raw_data = raw_data
       @data_bag_item.data_bag("books")
@@ -207,7 +207,7 @@ describe Chef::DataBagItem do
       @data_bag_item.save
     end
 
-    it "should create if the item is not found" do 
+    it "should create if the item is not found" do
       exception = mock("404 error", :code => "404")
       @rest.should_receive(:put_rest).and_raise(Net::HTTPServerException.new("foo", exception))
       @rest.should_receive(:post_rest).with("data/books", @data_bag_item)
@@ -228,7 +228,7 @@ describe Chef::DataBagItem do
       end
     end
 
-    
+
   end
 
   describe "when loading" do

data/spec/unit/data_bag_spec.rb

@@ -69,24 +69,23 @@ describe Chef::DataBag do
 
   end
 
-  describe "when saving" do 
+  describe "when saving" do
     before do
       @data_bag.name('piggly_wiggly')
       @rest = mock("Chef::REST")
       Chef::REST.stub!(:new).and_return(@rest)
     end
 
-    it "should update the data bag when it already exists" do
-      @rest.should_receive(:put_rest).with("data/piggly_wiggly", @data_bag) 
+    it "should silently proceed when the data bag already exists" do
+      exception = mock("409 error", :code => "409")
+      @rest.should_receive(:post_rest).and_raise(Net::HTTPServerException.new("foo", exception))
       @data_bag.save
     end
 
-    it "should create the data bag when it is not found" do 
-      exception = mock("404 error", :code => "404")
-      @rest.should_receive(:put_rest).and_raise(Net::HTTPServerException.new("foo", exception))
+    it "should create the data bag" do
       @rest.should_receive(:post_rest).with("data", @data_bag)
       @data_bag.save
-    end 
+    end
 
     describe "when whyrun mode is enabled" do
       before do
@@ -96,7 +95,6 @@ describe Chef::DataBag do
         Chef::Config[:why_run] = false
       end
       it "should not save" do
-        @rest.should_not_receive(:put_rest)
         @rest.should_not_receive(:post_rest)
         @data_bag.save
       end

data/spec/unit/digester_spec.rb

@@ -8,9 +8,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

data/spec/unit/encrypted_data_bag_item_spec.rb

@@ -74,14 +74,9 @@ describe Chef::EncryptedDataBagItem::Encryptor  do
   describe "when using version 2 format" do
 
     before do
-      @original_config = Chef::Config.hash_dup
       Chef::Config[:data_bag_encrypt_version] = 2
     end
 
-    after do
-      Chef::Config.configuration = @original_config
-    end
-
     it "creates a version 2 encryptor" do
       encryptor.should be_a_kind_of(Chef::EncryptedDataBagItem::Encryptor::Version2Encryptor)
     end
@@ -179,14 +174,9 @@ describe Chef::EncryptedDataBagItem::Decryptor do
 
     context "and version 2 format is required" do
       before do
-        @original_config = Chef::Config.hash_dup
         Chef::Config[:data_bag_decrypt_minimum_version] = 2
       end
 
-      after do
-        Chef::Config.configuration = @original_config
-      end
-
       it "raises an error attempting to decrypt" do
         lambda { decryptor }.should raise_error(Chef::EncryptedDataBagItem::UnacceptableEncryptedDataBagItemFormat)
       end
@@ -210,14 +200,9 @@ describe Chef::EncryptedDataBagItem::Decryptor do
 
     context "and version 1 format is required" do
       before do
-        @original_config = Chef::Config.hash_dup
         Chef::Config[:data_bag_decrypt_minimum_version] = 1
       end
 
-      after do
-        Chef::Config.configuration = @original_config
-      end
-
       it "raises an error attempting to decrypt" do
         lambda { decryptor }.should raise_error(Chef::EncryptedDataBagItem::UnacceptableEncryptedDataBagItemFormat)
       end

data/spec/unit/file_cache_spec.rb

@@ -41,7 +41,7 @@ describe Chef::FileCache do
     end
 
   end
-  
+
   describe "when storing a file" do
     before do
       File.stub!(:open).and_yield(@io)

data/spec/unit/formatters/error_inspectors/compile_error_inspector_spec.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -98,7 +98,7 @@ describe Chef::Formatters::ErrorInspectors::CompileErrorInspector do
     before do
       Chef::Config.stub!(:cookbook_path).and_return([ "C:/opscode/chef/var/cache/cookbooks" ])
       recipe_lines = BAD_RECIPE.split("\n").map {|l| l << "\n" }
-      IO.should_receive(:readlines).at_least(1).times.with(/:\/opscode\/chef\/var\/cache\/cookbooks\/foo\/recipes\/default.rb/).and_return(recipe_lines)      
+      IO.should_receive(:readlines).at_least(1).times.with(/:\/opscode\/chef\/var\/cache\/cookbooks\/foo\/recipes\/default.rb/).and_return(recipe_lines)
       @trace = [
         "C:/opscode/chef/var/cache/cookbooks/foo/recipes/default.rb:14 in `from_file'",
         "C:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/run_context.rb:144:in `rescue in block in load_libraries'",
@@ -141,7 +141,7 @@ describe Chef::Formatters::ErrorInspectors::CompileErrorInspector do
         @inspector.add_explanation(@description)
         @inspector.culprit_file.should == "c:/opscode/chef/var/cache/cookbooks/foo/recipes/default.rb"
       end
-    end 
+    end
 
     it "finds the line number of the error from the stack trace" do
       @inspector.culprit_line.should == 14

data/spec/unit/formatters/error_inspectors/cookbook_resolve_error_inspector_spec.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

data/spec/unit/formatters/error_inspectors/cookbook_sync_error_inspector_spec.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

data/spec/unit/formatters/error_inspectors/node_load_error_inspector_spec.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

data/spec/unit/formatters/error_inspectors/registration_error_inspector_spec.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

data/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -129,7 +129,7 @@ describe Chef::Formatters::ErrorInspectors::ResourceFailureInspector do
         @inspector = Chef::Formatters::ErrorInspectors::ResourceFailureInspector.new(@resource, :create, @exception)
         @inspector.recipe_snippet.should match(/^# In \/home\/btm/)
       end
-      
+
       context "when the recipe file does not exist" do
         before do
           File.stub!(:exists?).and_return(false)
@@ -141,7 +141,7 @@ describe Chef::Formatters::ErrorInspectors::ResourceFailureInspector do
           @inspector = Chef::Formatters::ErrorInspectors::ResourceFailureInspector.new(@resource, :create, @exception)
           @inspector.recipe_snippet.should be_nil
         end
-  
+
         it "does not raise an exception trying to load a non-existant file (CHEF-3411)" do
           @resource.source_line = "/somewhere/in/space"
           @inspector = Chef::Formatters::ErrorInspectors::ResourceFailureInspector.new(@resource, :create, @exception)

data/spec/unit/formatters/error_inspectors/run_list_expansion_error_inspector_spec.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

data/spec/unit/handler_spec.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -126,9 +126,9 @@ describe Chef::Handler do
       @end_time = @start_time + 4.2
       Time.stub!(:now).and_return(@start_time, @end_time)
       @run_status.start_clock
-      @run_status.stop_clock 
+      @run_status.stop_clock
     end
-    
+
     it "has a shortcut for all resources" do
       @handler.all_resources.should == @all_resources
     end
@@ -158,7 +158,7 @@ describe Chef::Handler do
     end
 
     it "has a shortcut for the success? and failed? predicates" do
-      @handler.success?.should be_true 
+      @handler.success?.should be_true
       @handler.failed?.should be_false
     end