chef 11.6.2 → 11.8.0.rc.1

data/spec/unit/provider/cron/{solaris_spec.rb → unix_spec.rb}

@@ -20,7 +20,7 @@
 
 require 'spec_helper'
 
-describe Chef::Provider::Cron::Solaris do
+describe Chef::Provider::Cron::Unix do
   before do
     @node = Chef::Node.new
     @events = Chef::EventDispatch::Dispatcher.new
@@ -30,7 +30,7 @@ describe Chef::Provider::Cron::Solaris do
     @new_resource.minute "30"
     @new_resource.command "/bin/true"
 
-    @provider = Chef::Provider::Cron::Solaris.new(@new_resource, @run_context)
+    @provider = Chef::Provider::Cron::Unix.new(@new_resource, @run_context)
   end
 
   it "should inherit from Chef::Provider:Cron" do
@@ -86,7 +86,7 @@ CRONTAB
   describe "write_crontab" do
     before :each do
       @status = mock("Status", :exitstatus => 0)
-      @provider.stub!(:run_command).and_return(@status)
+      @provider.stub!(:run_command_and_return_stdout_stderr).and_return(@status, String.new, String.new)
       @tempfile = mock("foo", :path => "/tmp/foo", :close => true)
       Tempfile.stub!(:new).and_return(@tempfile)
       @tempfile.should_receive(:flush)
@@ -95,13 +95,13 @@ CRONTAB
     end
 
     it "should call crontab for the user" do
-      @provider.should_receive(:run_command).with(hash_including(:user => @new_resource.user))
+      @provider.should_receive(:run_command_and_return_stdout_stderr).with(hash_including(:user => @new_resource.user))
       @tempfile.should_receive(:<<).with("Foo")
       @provider.send(:write_crontab, "Foo")
     end
 
     it "should call crontab with a file containing the crontab" do
-      @provider.should_receive(:run_command) do |args|
+      @provider.should_receive(:run_command_and_return_stdout_stderr) do |args|
         (args[:command] =~ %r{\A/usr/bin/crontab (/\S+)\z}).should be_true
         $1.should == "/tmp/foo"
         @status
@@ -115,7 +115,7 @@ CRONTAB
       @status.stub!(:exitstatus).and_return(1)
       lambda do
         @provider.send(:write_crontab, "Foo")
-      end.should raise_error(Chef::Exceptions::Cron, "Error updating state of #{@new_resource.name}, exit: 1")
+      end.should raise_error(Chef::Exceptions::Cron, /Error updating state of #{@new_resource.name}, exit: 1/)
     end
   end
 end

data/spec/unit/provider/cron_spec.rb

@@ -181,7 +181,7 @@ CRONTAB
       before :each do
         @provider.stub!(:read_crontab).and_return(<<-CRONTAB)
 0 2 * * * /some/other/command
-      
+
 # Chef Name: cronhole some stuff
 * 5 * Jan Mon /bin/true param1 param2
 # Chef Name: something else
@@ -196,7 +196,7 @@ CRONTAB
         @provider.cron_exists.should == true
         @provider.cron_empty.should == false
       end
-        
+
       it "should pull the details out of the cron line" do
         cron = @provider.load_current_resource
         cron.minute.should == '*'
@@ -563,7 +563,7 @@ HOME=/home/foo
         @provider.stub!(:read_crontab).and_return(<<-CRONTAB)
 0 2 * * * /some/other/command
 
-# Chef Name: something else
+# Chef Name: cronhole some stuff
 * 5 * * * /bin/true
 
 # Another comment
@@ -581,6 +581,7 @@ CRONTAB
       end
 
       it "should log nothing changed" do
+        Chef::Log.should_receive(:debug).with("Found cron '#{@new_resource.name}'")
         Chef::Log.should_receive(:debug).with("Skipping existing cron entry '#{@new_resource.name}'")
         @provider.run_action(:create)
       end
@@ -808,5 +809,22 @@ MAILTO=foo@example.com
         @provider.send(:write_crontab, "Foo")
       end.should raise_error(Chef::Exceptions::Cron, "Error updating state of #{@new_resource.name}, exit: 1")
     end
+
+    it "should raise an exception if the command die's and parent tries to write" do
+      class WriteErrPipe
+        def write(str)
+          raise Errno::EPIPE, "Test"
+        end
+      end
+      @status.stub!(:exitstatus).and_return(1)
+      @provider.stub!(:popen4).and_yield(1234, WriteErrPipe.new, StringIO.new, StringIO.new).and_return(@status)
+
+      Chef::Log.should_receive(:debug).with("Broken pipe - Test")
+
+      lambda do
+        @provider.send(:write_crontab, "Foo")
+      end.should raise_error(Chef::Exceptions::Cron, "Error updating state of #{@new_resource.name}, exit: 1")
+    end
+
   end
 end

data/spec/unit/provider/deploy/timestamped_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.
@@ -19,7 +19,7 @@
 require 'spec_helper'
 
 describe Chef::Provider::Deploy::Timestamped do
-  
+
   before do
     @release_time = Time.utc( 2004, 8, 15, 16, 23, 42)
     Time.stub!(:now).and_return(@release_time)
@@ -32,9 +32,9 @@ describe Chef::Provider::Deploy::Timestamped do
     @runner = mock("runnah")
     Chef::Runner.stub!(:new).and_return(@runner)
   end
-  
+
   it "gives a timestamp for release_slug" do
     @timestamped_deploy.send(:release_slug).should == "20040815162342"
   end
-  
+
 end

data/spec/unit/provider/deploy_spec.rb

@@ -43,6 +43,20 @@ describe Chef::Provider::Deploy do
     @provider.should respond_to(:action_rollback)
   end
 
+  context "when the deploy resource has a timeout attribute" do
+    let(:ten_seconds) { 10 }
+    before { @resource.timeout(ten_seconds) }
+    it "relays the timeout to the scm resource" do
+      @provider.scm_provider.new_resource.timeout.should == ten_seconds
+    end
+  end
+
+  context "when the deploy resource has no timeout attribute" do
+    it "should not set a timeout on the scm resource" do
+      @provider.scm_provider.new_resource.timeout.should be_nil
+    end
+  end
+
   context "when the deploy_to dir does not exist yet" do
     before do
       FileUtils.should_receive(:mkdir_p).with(@resource.deploy_to).ordered
@@ -149,18 +163,18 @@ describe Chef::Provider::Deploy do
     @provider.stub!(:deploy).and_return{ raise "Unexpected error" }
     @provider.stub!(:previous_release_path).and_return('previous_release')
     @provider.should_not_receive(:rollback)
-    lambda { 
+    lambda {
       @provider.run_action(:deploy)
     }.should raise_exception(RuntimeError, "Unexpected error")
   end
-  
+
   it "rollbacks to previous release if error happens on deploy" do
     @resource.rollback_on_error true
     @provider.stub!(:all_releases).and_return(['previous_release'])
     @provider.stub!(:deploy).and_return{ raise "Unexpected error" }
     @provider.stub!(:previous_release_path).and_return('previous_release')
     @provider.should_receive(:rollback)
-    lambda { 
+    lambda {
       @provider.run_action(:deploy)
     }.should raise_exception(RuntimeError, "Unexpected error")
   end
@@ -211,15 +225,15 @@ describe Chef::Provider::Deploy do
         #FileUtils.should_receive(:rm_rf).with("/my/deploy/dir/releases/20040815162342")
         #@provider.run_action(:rollback)
         #@provider.release_path.should eql(NIL) -- no check needed since assertions will fail
-        lambda { 
+        lambda {
           @provider.run_action(:rollback)
         }.should raise_exception(RuntimeError, "There is no release to rollback to!")
       end
-      
+
       it "an exception is raised when there are no releases" do
         all_releases = []
         Dir.stub!(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases)
-        lambda { 
+        lambda {
           @provider.run_action(:rollback)
         }.should raise_exception(RuntimeError, "There is no release to rollback to!")
       end
@@ -419,7 +433,7 @@ describe Chef::Provider::Deploy do
       @provider.should_receive(:enforce_ownership)
       @provider.link_tempfiles_to_current_release
     end
-    
+
   end
 
   it "does nothing for restart if restart_command is empty" do

data/spec/unit/provider/env_spec.rb

@@ -81,7 +81,7 @@ describe Chef::Provider::Env do
       @provider.action_create
     end
 
-    it "should set the the new_resources updated flag when it creates the key" do
+    it "should set the new_resources updated flag when it creates the key" do
       @provider.action_create
       @new_resource.should be_updated
     end
@@ -99,7 +99,7 @@ describe Chef::Provider::Env do
       @provider.action_create
     end
 
-    it "should set the the new_resources updated flag when it updates an existing value" do
+    it "should set the new_resources updated flag when it updates an existing value" do
       @provider.key_exists = true
       @provider.stub!(:compare_value).and_return(true)
       @provider.stub!(:modify_env).and_return(true)

data/spec/unit/provider/execute_spec.rb

@@ -31,7 +31,7 @@ describe Chef::Provider::Execute do
     @provider = Chef::Provider::Execute.new(@new_resource, @run_context)
     @current_resource = Chef::Resource::Ifconfig.new("foo_resource", @run_context)
     @provider.current_resource = @current_resource
-    Chef::Log.level = :info 
+    Chef::Log.level = :info
     # FIXME: There should be a test for how STDOUT.tty? changes the live_stream option being passed
     STDOUT.stub!(:tty?).and_return(true)
   end
@@ -73,7 +73,7 @@ describe Chef::Provider::Execute do
 
     @provider.run_action(:run)
     @new_resource.should_not be_updated
-  end 
+  end
 
   it "should warn if user specified relative path without cwd" do
     @new_resource.creates "foo_resource"

data/spec/unit/provider/file/content_spec.rb

@@ -20,14 +20,6 @@ require 'spec_helper'
 
 describe Chef::Provider::File::Content do
 
-  before(:all) do
-    @original_config = Chef::Config.configuration
-  end
-
-  after(:all) do
-    Chef::Config.configuration.replace(@original_config)
-  end
-
   #
   # mock setup
   #

data/spec/unit/provider/git_spec.rb

@@ -165,15 +165,35 @@ SHAS
     @provider.should respond_to(:revision_slug)
   end
 
-  it "runs a clone command with default git options" do
-    @resource.user "deployNinja"
-    @resource.ssh_wrapper "do_it_this_way.sh"
-    expected_cmd = "git clone  \"git://github.com/opscode/chef.git\" \"/my/deploy/dir\""
-    @provider.should_receive(:shell_out!).with(expected_cmd, :user => "deployNinja",
-                                                :environment =>{"GIT_SSH"=>"do_it_this_way.sh"},
-                                                :log_tag => "git[web2.0 app]" )
-
-    @provider.clone
+  context "with an ssh wrapper" do
+    let(:deploy_user)  { "deployNinja" }
+    let(:wrapper)      { "do_it_this_way.sh" }
+    let(:expected_cmd) { 'git clone  "git://github.com/opscode/chef.git" "/my/deploy/dir"' }
+    let(:default_options) do
+      {
+        :user => deploy_user,
+        :environment => { "GIT_SSH" => wrapper },
+        :log_tag => "git[web2.0 app]"
+      }
+    end
+    before do
+      @resource.user deploy_user
+      @resource.ssh_wrapper wrapper
+    end
+    context "without a timeout set" do
+      it "clones a repo with default git options" do
+        @provider.should_receive(:shell_out!).with(expected_cmd, default_options)
+        @provider.clone
+      end
+    end
+    context "with a timeout set" do
+      let (:seconds) { 10 }
+      before { @resource.timeout(seconds) }
+      it "clones a repo with amended git options" do
+        @provider.should_receive(:shell_out!).with(expected_cmd, default_options.merge(:timeout => seconds))
+        @provider.clone
+      end
+    end
   end
 
   it "runs a clone command with escaped destination" do

data/spec/unit/provider/group/dscl_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.
@@ -27,14 +27,14 @@ describe Chef::Provider::Group::Dscl do
     @current_resource = Chef::Resource::Group.new("aj")
     @provider = Chef::Provider::Group::Dscl.new(@new_resource, @run_context)
     @provider.current_resource = @current_resource
-    @status = mock("Process::Status", :exitstatus => 0) 
+    @status = mock("Process::Status", :exitstatus => 0)
     @pid = 2342
     @stdin = StringIO.new
     @stdout = StringIO.new("\n")
     @stderr = StringIO.new("")
     @provider.stub!(:popen4).and_yield(@pid,@stdin,@stdout,@stderr).and_return(@status)
   end
-  
+
   it "should run popen4 with the supplied array of arguments appended to the dscl command" do
     @provider.should_receive(:popen4).with("dscl . -cmd /Path arg1 arg2")
     @provider.dscl("cmd", "/Path", "arg1", "arg2")
@@ -52,7 +52,7 @@ describe Chef::Provider::Group::Dscl do
       @provider = Chef::Provider::Group::Dscl.new(@node, @new_resource)
       @provider.stub!(:dscl).and_return(["cmd", @status, "stdout", "stderr"])
     end
- 
+
     it "should run dscl with the supplied cmd /Path args" do
       @provider.should_receive(:dscl).with("cmd /Path args")
       @provider.safe_dscl("cmd /Path args")
@@ -84,7 +84,7 @@ describe Chef::Provider::Group::Dscl do
         lambda { @provider.safe_dscl("cmd /Path arguments") }.should raise_error(Chef::Exceptions::Group)
       end
     end
- 
+
     describe "with the dscl command returning a zero exit status" do
       it "should return the third array element, the string of standard output" do
         safe_dscl_retval = @provider.safe_dscl("cmd /Path args")
@@ -100,7 +100,7 @@ describe Chef::Provider::Group::Dscl do
       @provider = Chef::Provider::Group::Dscl.new(@node, @new_resource)
       @provider.stub!(:safe_dscl).and_return("\naj      200\njt      201\n")
     end
-  
+
     it "should run safe_dscl with list /Groups gid" do
       @provider.should_receive(:safe_dscl).with("list /Groups gid")
       @provider.get_free_gid
@@ -109,7 +109,7 @@ describe Chef::Provider::Group::Dscl do
     it "should return the first unused gid number on or above 200" do
       @provider.get_free_gid.should equal(202)
     end
-  
+
     it "should raise an exception when the search limit is exhausted" do
       search_limit = 1
       lambda { @provider.get_free_gid(search_limit) }.should raise_error(RuntimeError)
@@ -127,7 +127,7 @@ describe Chef::Provider::Group::Dscl do
       @provider.should_receive(:safe_dscl).with("list /Groups gid")
       @provider.gid_used?(500)
     end
-  
+
     it "should return true for a used gid number" do
       @provider.gid_used?(500).should be_true
     end
@@ -151,7 +151,7 @@ describe Chef::Provider::Group::Dscl do
         lambda { @provider.set_gid }.should raise_error(Chef::Exceptions::Group)
       end
     end
-  
+
     describe "with no gid number for the new resources" do
       it "should run get_free_gid and return a valid, unused gid number" do
         @provider.should_receive(:get_free_gid).and_return(501)
@@ -220,7 +220,7 @@ describe Chef::Provider::Group::Dscl do
         @provider.set_members
       end
     end
-  
+
     describe "with no members in the new resource" do
       before do
         @new_resource.append(true)
@@ -276,7 +276,7 @@ describe Chef::Provider::Group::Dscl do
       @provider.should_receive(:set_gid)
       @provider.manage_group
     end
-    
+
     it "should manage the members if it changed and the new resources members is not null" do
       @current_resource.members(%{charlie root})
       @new_resource.members(%{crab revenge})

data/spec/unit/provider/group/gpasswd_spec.rb

@@ -36,8 +36,8 @@ describe Chef::Provider::Group::Gpasswd, "modify_group_members" do
       @provider.define_resource_requirements
     end
 
-    # Checking for required binaries is already done in the spec 
-    # for Chef::Provider::Group - no need to repeat it here.  We'll 
+    # Checking for required binaries is already done in the spec
+    # for Chef::Provider::Group - no need to repeat it here.  We'll
     # include only what's specific to this provider.
     it "should raise an error if the required binary /usr/bin/gpasswd doesn't exist" do
       File.stub!(:exists?).and_return(true)

data/spec/unit/provider/group/groupadd_spec.rb

@@ -27,10 +27,12 @@ describe Chef::Provider::Group::Groupadd, "set_options" do
     @new_resource.gid(50)
     @new_resource.members(["root", "aj"])
     @new_resource.system false
+    @new_resource.non_unique false
     @current_resource = Chef::Resource::Group.new("aj")
     @current_resource.gid(50)
     @current_resource.members(["root", "aj"])
     @current_resource.system false
+    @current_resource.non_unique false
     @provider = Chef::Provider::Group::Groupadd.new(@new_resource, @run_context)
     @provider.current_resource = @current_resource
   end
@@ -72,6 +74,18 @@ describe Chef::Provider::Group::Groupadd, "set_options" do
       @provider.groupadd_options.should == " -r"
     end
   end
+
+  describe "when we want to create a non_unique gid group" do
+    it "should not set groupadd_options '-o' when non_unique is false" do
+      @new_resource.non_unique(false)
+      @provider.groupadd_options.should_not =~ /-o/
+    end
+
+    it "should set groupadd -o if non_unique is true" do
+      @new_resource.non_unique(true)
+      @provider.groupadd_options.should == " -o"
+    end
+  end
 end
 
 describe Chef::Provider::Group::Groupadd, "create_group" do