chef 10.34.6 → 11.0.0.beta.0

data/spec/unit/run_lock_spec.rb

@@ -0,0 +1,37 @@
+#
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require File.expand_path('../../spec_helper', __FILE__)
+require 'chef/client'
+
+describe Chef::RunLock do
+
+  describe "when first created" do
+    it "locates the lockfile in the file cache path by default" do
+      run_lock = Chef::RunLock.new(:file_cache_path => "/var/chef/cache", :lockfile => nil)
+      run_lock.runlock_file.should == "/var/chef/cache/chef-client-running.pid"
+    end
+
+    it "locates the lockfile in the user-configured path when set" do
+      run_lock = Chef::RunLock.new(:file_cache_path => "/var/chef/cache", :lockfile => "/tmp/chef-client-running.pid")
+      run_lock.runlock_file.should == "/tmp/chef-client-running.pid"
+    end
+  end
+
+  # See also: spec/functional/run_lock_spec
+
+end

data/spec/unit/runner_spec.rb

@@ -52,13 +52,40 @@ class SnitchyProvider < Chef::Provider
 
 end
 
+class FailureResource < Chef::Resource
+
+  attr_accessor :action
+
+  def initialize(*args)
+    super
+    @action = :fail
+  end
+
+  def provider
+    FailureProvider
+  end
+end
+
+class FailureProvider < Chef::Provider
+
+  class ChefClientFail < StandardError; end
+
+  def load_current_resource
+    true
+  end
+
+  def action_fail
+    raise ChefClientFail, "chef had an error of some sort"
+  end
+end
+
 describe Chef::Runner do
 
   before(:each) do
     @node = Chef::Node.new
     @node.name "latte"
-    @node.platform "mac_os_x"
-    @node.platform_version "10.5.1"
+    @node.automatic[:platform] = "mac_os_x"
+    @node.automatic[:platform_version] = "10.5.1"
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, Chef::CookbookCollection.new({}), @events)
     @first_resource = Chef::Resource::Cat.new("loulou1", @run_context)
@@ -167,6 +194,78 @@ describe Chef::Runner do
     @first_resource.should be_updated
   end
 
+  it "should execute delayed notifications when a failure occurs in the chef client run" do
+    @first_resource.action = :nothing
+    second_resource = Chef::Resource::Cat.new("peanut", @run_context)
+    second_resource.action = :purr
+
+    @run_context.resource_collection << second_resource
+    second_resource.notifies(:purr, @first_resource, :delayed)
+
+    third_resource = FailureResource.new("explode", @run_context)
+    @run_context.resource_collection << third_resource
+
+    lambda {@runner.converge}.should raise_error(FailureProvider::ChefClientFail)
+
+    @first_resource.should be_updated
+  end
+
+  it "should execute delayed notifications when a failure occurs in a notification" do
+    @first_resource.action = :nothing
+    second_resource = Chef::Resource::Cat.new("peanut", @run_context)
+    second_resource.action = :purr
+
+    @run_context.resource_collection << second_resource
+
+    third_resource = FailureResource.new("explode", @run_context)
+    third_resource.action = :nothing
+    @run_context.resource_collection << third_resource
+
+    second_resource.notifies(:fail, third_resource, :delayed)
+    second_resource.notifies(:purr, @first_resource, :delayed)
+
+    lambda {@runner.converge}.should raise_error(FailureProvider::ChefClientFail)
+
+    @first_resource.should be_updated
+  end
+
+  it "should execute delayed notifications when a failure occurs in multiple notifications" do
+    @first_resource.action = :nothing
+    second_resource = Chef::Resource::Cat.new("peanut", @run_context)
+    second_resource.action = :purr
+
+    @run_context.resource_collection << second_resource
+
+    third_resource = FailureResource.new("explode", @run_context)
+    third_resource.action = :nothing
+    @run_context.resource_collection << third_resource
+
+    fourth_resource = FailureResource.new("explode again", @run_context)
+    fourth_resource.action = :nothing
+    @run_context.resource_collection << fourth_resource
+
+    second_resource.notifies(:fail, third_resource, :delayed)
+    second_resource.notifies(:fail, fourth_resource, :delayed)
+    second_resource.notifies(:purr, @first_resource, :delayed)
+
+    exception = nil
+    begin
+      @runner.converge
+    rescue => e
+      exception = e
+    end
+    exception.should be_a(Chef::Exceptions::MultipleFailures)
+
+    expected_message =<<-E
+Multiple failures occurred:
+* FailureProvider::ChefClientFail occurred in delayed notification: [explode] (dynamically defined) had an error: FailureProvider::ChefClientFail: chef had an error of some sort
+* FailureProvider::ChefClientFail occurred in delayed notification: [explode again] (dynamically defined) had an error: FailureProvider::ChefClientFail: chef had an error of some sort
+E
+    exception.message.should == expected_message
+
+    @first_resource.should be_updated
+  end
+
   it "does not duplicate delayed notifications" do
     SnitchyProvider.clear_action_record
 

data/spec/unit/scan_access_control_spec.rb

@@ -60,7 +60,7 @@ describe Chef::ScanAccessControl do
       end
 
       it "sets the mode of the current resource to the current mode as a String" do
-        @current_resource.mode.should == "644"
+        @current_resource.mode.should == "0644"
       end
 
       context "on unix", :unix_only do
@@ -91,7 +91,7 @@ describe Chef::ScanAccessControl do
       end
 
       it "sets the mode of the current resource to the file's current mode as a string" do
-        @current_resource.mode.should == "644"
+        @current_resource.mode.should == "0644"
       end
     end
 
@@ -101,8 +101,8 @@ describe Chef::ScanAccessControl do
         @scanner.set_all!
       end
 
-      it "sets the mode of the current resource to the current mode as an integer" do
-        @current_resource.mode.should == 00644
+      it "sets the mode of the current resource to the current mode as a String" do
+        @current_resource.mode.should == "0644"
       end
 
     end

data/spec/unit/{shef → shell}/model_wrapper_spec.rb

@@ -19,16 +19,16 @@
 require 'spec_helper'
 require 'ostruct'
 
-describe Shef::ModelWrapper do
+describe Shell::ModelWrapper do
   before do
     @model = OpenStruct.new(:name=>"Chef::Node")
-    @wrapper = Shef::ModelWrapper.new(@model)
+    @wrapper = Shell::ModelWrapper.new(@model)
   end
 
   describe "when created with an explicit model_symbol" do
     before do
       @model = OpenStruct.new(:name=>"Chef::ApiClient")
-      @wrapper = Shef::ModelWrapper.new(@model, :client)
+      @wrapper = Shell::ModelWrapper.new(@model, :client)
     end
 
     it "uses the explicit model symbol" do
@@ -47,7 +47,7 @@ describe Shef::ModelWrapper do
       @node_2 = Chef::Node.new
       @node_2.name("yummy")
       @server_response = {:node_1 => @node_1, :node_2 => @node_2}
-      @wrapper = Shef::ModelWrapper.new(Chef::Node)
+      @wrapper = Shell::ModelWrapper.new(Chef::Node)
       Chef::Node.stub(:list).and_return(@server_response)
     end
 
@@ -68,7 +68,7 @@ describe Shef::ModelWrapper do
       @node_2 = Chef::Node.new
       @node_2.name("yummy")
       @server_response = {:node_1 => @node_1, :node_2 => @node_2}
-      @wrapper = Shef::ModelWrapper.new(Chef::Node)
+      @wrapper = Shell::ModelWrapper.new(Chef::Node)
 
       # Creating a Chef::Search::Query object tries to read the private key...
       @searcher = mock("Chef::Search::Query #{__FILE__}:#{__LINE__}")

data/spec/unit/{shef/shef_ext_spec.rb → shell/shell_ext_spec.rb}

@@ -18,16 +18,16 @@
 
 require 'spec_helper'
 
-describe Shef::Extensions do
+describe Shell::Extensions do
   describe "extending object for top level methods" do
 
     before do
-      @shef_client = TestableShefSession.instance
-      Shef.stub!(:session).and_return(@shef_client)
+      @shell_client = TestableShellSession.instance
+      Shell.stub!(:session).and_return(@shell_client)
       @job_manager = TestJobManager.new
       @root_context = Object.new
       @root_context.instance_eval(&ObjectTestHarness)
-      Shef::Extensions.extend_context_object(@root_context)
+      Shell::Extensions.extend_context_object(@root_context)
       @root_context.conf = mock("irbconf")
     end
 
@@ -39,39 +39,39 @@ describe Shef::Extensions do
       @job_manager.jobs = [[:thread, irb_session]]
       @root_context.stub!(:jobs).and_return(@job_manager)
       @root_context.ensure_session_select_defined
-      @root_context.jobs.select_shef_session(target_context_obj).should == irb_session
-      @root_context.jobs.select_shef_session(:idontexist).should be_nil
+      @root_context.jobs.select_shell_session(target_context_obj).should == irb_session
+      @root_context.jobs.select_shell_session(:idontexist).should be_nil
     end
 
     it "finds, then switches to a session" do
       @job_manager.jobs = []
       @root_context.stub!(:ensure_session_select_defined)
       @root_context.stub!(:jobs).and_return(@job_manager)
-      @job_manager.should_receive(:select_shef_session).and_return(:the_shef_session)
-      @job_manager.should_receive(:switch).with(:the_shef_session)
+      @job_manager.should_receive(:select_shell_session).and_return(:the_shell_session)
+      @job_manager.should_receive(:switch).with(:the_shell_session)
       @root_context.find_or_create_session_for(:foo)
     end
 
     it "creates a new session if an existing one isn't found" do
       @job_manager.jobs = []
       @root_context.stub!(:jobs).and_return(@job_manager)
-      @job_manager.stub!(:select_shef_session).and_return(nil)
+      @job_manager.stub!(:select_shell_session).and_return(nil)
       @root_context.should_receive(:irb).with(:foo)
       @root_context.find_or_create_session_for(:foo)
     end
 
     it "switches to recipe context" do
-      @root_context.should respond_to(:recipe)
-      @shef_client.recipe = :monkeyTime
+      @root_context.should respond_to(:recipe_mode)
+      @shell_client.recipe = :monkeyTime
       @root_context.should_receive(:find_or_create_session_for).with(:monkeyTime)
-      @root_context.recipe
+      @root_context.recipe_mode
     end
 
     it "switches to attribute context" do
-      @root_context.should respond_to(:attributes)
-      @shef_client.node = "monkeyNodeTime"
+      @root_context.should respond_to(:attributes_mode)
+      @shell_client.node = "monkeyNodeTime"
       @root_context.should_receive(:find_or_create_session_for).with("monkeyNodeTime")
-      @root_context.attributes
+      @root_context.attributes_mode
     end
 
     it "has a help command" do
@@ -93,7 +93,7 @@ describe Shef::Extensions do
 
     it "prints node attributes" do
       node = mock("node", :attribute => {:foo => :bar})
-      @shef_client.node = node
+      @shell_client.node = node
       @root_context.should_receive(:pp).with({:foo => :bar})
       @root_context.ohai
       @root_context.should_receive(:pp).with(:bar)
@@ -101,7 +101,7 @@ describe Shef::Extensions do
     end
 
     it "resets the recipe and reloads ohai data" do
-      @shef_client.should_receive(:reset!)
+      @shell_client.should_receive(:reset!)
       @root_context.reset
     end
 
@@ -117,12 +117,12 @@ describe Shef::Extensions do
     end
 
     it "gives access to the stepable iterator" do
-      Shef::StandAloneSession.instance.stub!(:reset!)
-      Shef.session.stub!(:rebuild_context)
+      Shell::StandAloneSession.instance.stub!(:reset!)
+      Shell.session.stub!(:rebuild_context)
       events = Chef::EventDispatch::Dispatcher.new
       run_context = Chef::RunContext.new(Chef::Node.new, {}, events)
       run_context.resource_collection.instance_variable_set(:@iterator, :the_iterator)
-      Shef.session.run_context = run_context
+      Shell.session.run_context = run_context
       @root_context.chef_run.should == :the_iterator
     end
 
@@ -140,7 +140,7 @@ describe Shef::Extensions do
       @events = Chef::EventDispatch::Dispatcher.new
       @run_context = Chef::RunContext.new(Chef::Node.new, {}, @events)
       @recipe_object = Chef::Recipe.new(nil, nil, @run_context)
-      Shef::Extensions.extend_context_recipe(@recipe_object)
+      Shell::Extensions.extend_context_recipe(@recipe_object)
     end
 
     it "gives a list of the resources" do

data/spec/unit/{shef/shef_session_spec.rb → shell/shell_session_spec.rb}

@@ -19,7 +19,7 @@ require 'spec_helper'
 require "ostruct"
 
 
-class TestableShefSession < Shef::ShefSession
+class TestableShellSession < Shell::ShellSession
 
   def rebuild_node
     nil
@@ -39,54 +39,22 @@ class TestableShefSession < Shef::ShefSession
 
 end
 
-describe Shef::ShefSession do
+describe Shell::ShellSession do
 
   it "is a singleton object" do
-    Shef::ShefSession.should include(Singleton)
+    Shell::ShellSession.should include(Singleton)
   end
 
 end
 
-describe Shef::ClientSession do
+describe Shell::StandAloneSession do
   before do
-    Chef::Config[:shell_config] = { :override_runlist => [Chef::RunList::RunListItem.new('shell::override')] }
-    @session = Shef::ClientSession.instance
-    @node = Chef::Node.build("foo")
-    @session.node = @node
-    @client = double("Chef::Client.new",
-                     :run_ohai => true,
-                     :load_node => true,
-                     :build_node => true,
-                     :register => true,
-                     :sync_cookbooks => {})
-  end
-
-  it "builds the node's run_context with the proper environment" do
-    @session.instance_variable_set(:@client, @client)
-
-
-    @expansion = Chef::RunList::RunListExpansion.new(@node.chef_environment, [])
-
-    @node.run_list.should_receive(:expand).with(@node.chef_environment).and_return(@expansion)
-    @session.rebuild_context
-  end
-
-  it "passes the shell CLI args to the client" do
-    Chef::Client.should_receive(:new).with(nil, Chef::Config[:shell_config]).and_return(@client)
-    @session.send(:rebuild_node)
-  end
-
-end
-
-describe Shef::StandAloneSession do
-  before do
-    Chef::Config[:shell_config] = { :override_runlist => [Chef::RunList::RunListItem.new('shell::override')] }
-    @session = Shef::StandAloneSession.instance
+    @session = Shell::StandAloneSession.instance
     @node = @session.node = Chef::Node.new
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = @session.run_context = Chef::RunContext.new(@node, {}, @events)
     @recipe = @session.recipe = Chef::Recipe.new(nil, nil, @run_context)
-    Shef::Extensions.extend_context_recipe(@recipe)
+    Shell::Extensions.extend_context_recipe(@recipe)
   end
 
   it "has a run_context" do
@@ -116,44 +84,32 @@ describe Shef::StandAloneSession do
     @recipe.run_chef.should == :converged
   end
 
-  it "passes the shell CLI args to the client" do
-    @client = double("Chef::Client.new",
-                     :run_ohai => true,
-                     :load_node => true,
-                     :build_node => true,
-                     :register => true,
-                     :sync_cookbooks => {})
-    Chef::Client.should_receive(:new).with(nil, Chef::Config[:shell_config]).and_return(@client)
-    @session.send(:rebuild_node)
-  end
-
 end
 
-describe Shef::SoloSession do
+describe Shell::SoloSession do
   before do
-    Chef::Config[:shell_config] = { :override_runlist => [Chef::RunList::RunListItem.new('shell::override')] }
-    Chef::Config[:shef_solo] = true
-    @session = Shef::SoloSession.instance
+    Chef::Config[:shell_solo] = true
+    @session = Shell::SoloSession.instance
     @node = Chef::Node.new
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = @session.run_context = Chef::RunContext.new(@node, {}, @events)
     @session.node = @node
     @recipe = @session.recipe = Chef::Recipe.new(nil, nil, @run_context)
-    Shef::Extensions.extend_context_recipe(@recipe)
+    Shell::Extensions.extend_context_recipe(@recipe)
   end
 
   after do
-    Chef::Config[:shef_solo] = nil
+    Chef::Config[:shell_solo] = nil
   end
 
-  it "returns a collection based on its compilation object and the extra recipe provided by shef" do
+  it "returns a collection based on it's compilation object and the extra recipe provided by chef-shell" do
     @session.stub!(:node_built?).and_return(true)
     kitteh = Chef::Resource::Cat.new("keyboard")
     @recipe.run_context.resource_collection << kitteh
     @session.resource_collection.should include(kitteh)
   end
 
-  it "returns definitions from its compilation object" do
+  it "returns definitions from it's compilation object" do
     @session.definitions.should == @run_context.definitions
   end
 
@@ -163,7 +119,7 @@ describe Shef::SoloSession do
     #pending "1) keep attribs in an ivar 2) pass them to the node 3) feed them to the node on reset"
   end
 
-  it "generates its resource collection from the compiled cookbooks and the ad hoc recipe" do
+  it "generates it's resource collection from the compiled cookbooks and the ad hoc recipe" do
     @session.stub!(:node_built?).and_return(true)
     kitteh_cat = Chef::Resource::Cat.new("kitteh")
     @run_context.resource_collection << kitteh_cat
@@ -182,15 +138,4 @@ describe Shef::SoloSession do
     @recipe.run_chef.should == :converged
   end
 
-  it "passes the shell CLI args to the client" do
-    @client = double("Chef::Client.new",
-                     :run_ohai => true,
-                     :load_node => true,
-                     :build_node => true,
-                     :register => true,
-                     :sync_cookbooks => {})
-    Chef::Client.should_receive(:new).with(nil, Chef::Config[:shell_config]).and_return(@client)
-    @session.send(:rebuild_node)
-  end
-
 end