chef 10.14.0.beta.2 → 10.14.0.beta.3

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

@@ -66,6 +66,26 @@ describe Chef::Formatters::ErrorInspectors::ResourceFailureInspector do
       @description.display(@outputter)
     end
 
-  end
+    describe "recipe_snippet" do
+      before do
+        # fake code to run through #recipe_snippet
+        source_file = [ "if true", "var = non_existant", "end" ]
+        IO.stub!(:readlines).and_return(source_file)
+      end
+
+      it "parses a Windows path" do
+        source_line = "C:/Users/btm/chef/chef/spec/unit/fake_file.rb:2: undefined local variable or method `non_existant' for main:Object (NameError)"
+        @resource.source_line = source_line
+        @inspector = Chef::Formatters::ErrorInspectors::ResourceFailureInspector.new(@resource, :create, @exception)
+        @inspector.recipe_snippet.should match(/^# In C:\/Users\/btm/)
+      end
 
+      it "parses a unix path" do
+        source_line = "/home/btm/src/chef/chef/spec/unit/fake_file.rb:2: undefined local variable or method `non_existant' for main:Object (NameError)"
+        @resource.source_line = source_line
+        @inspector = Chef::Formatters::ErrorInspectors::ResourceFailureInspector.new(@resource, :create, @exception)
+        @inspector.recipe_snippet.should match(/^# In \/home\/btm/)
+      end
+    end
+  end
 end

data/spec/unit/knife/config_file_selection_spec.rb

@@ -17,6 +17,7 @@
 #
 
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'tmpdir'
 
 describe Chef::Knife do
   before :each do
@@ -24,11 +25,11 @@ describe Chef::Knife do
   end
 
   it "configure knife from KNIFE_HOME env variable" do
-    env_config = File.expand_path('/tmp/knife.rb')
+    env_config = File.expand_path(File.join(Dir.tmpdir, 'knife.rb'))
     File.stub!(:exist?).and_return(false)
     File.stub!(:exist?).with(env_config).and_return(true)
 
-    ENV['KNIFE_HOME'] = '/tmp'
+    ENV['KNIFE_HOME'] = Dir.tmpdir
     @knife = Chef::Knife.new
     @knife.configure_chef
     @knife.config[:config_file].should == env_config
@@ -78,7 +79,7 @@ describe Chef::Knife do
   end
   
   it "configure knife precedence" do
-    env_config = '/tmp/knife.rb'
+    env_config = File.join(Dir.tmpdir, 'knife.rb')
     pwd_config = "#{Dir.pwd}/knife.rb"
     upward_dir = File.expand_path "#{Dir.pwd}/.chef"
     upward_config = File.expand_path "#{upward_dir}/knife.rb"
@@ -88,7 +89,7 @@ describe Chef::Knife do
       configs.include? arg
     end
     Chef::Knife.stub!(:chef_config_dir).and_return(upward_dir)
-    ENV['KNIFE_HOME'] = '/tmp'
+    ENV['KNIFE_HOME'] = Dir.tmpdir
    
     @knife = Chef::Knife.new
     @knife.configure_chef

data/spec/unit/knife/cookbook_upload_spec.rb

@@ -81,6 +81,7 @@ describe Chef::Knife::CookbookUpload do
             "test_cookbook2" =>  @test_cookbook2,
             "test_cookbook3" => @test_cookbook3 }[ckbk]
         end
+        @knife.stub!(:cookbook_names).and_return(["test_cookbook1", "test_cookbook2", "test_cookbook3"])
         @knife.should_receive(:upload).exactly(3).times
         Timeout::timeout(5) do
           @knife.run
@@ -104,13 +105,13 @@ describe Chef::Knife::CookbookUpload do
       end
 
       it 'should upload all cookbooks' do
-        @knife.should_receive(:upload).twice
+        @knife.should_receive(:upload).once
         @knife.run
       end
 
       it 'should report on success' do
-        @knife.should_receive(:upload).twice
-        @knife.ui.should_receive(:info).with(/Uploaded 2 cookbooks/)
+        @knife.should_receive(:upload).once
+        @knife.ui.should_receive(:info).with(/Uploaded all cookbooks/)
         @knife.run
       end
 

data/spec/unit/mixin/enforce_ownership_and_permissions_spec.rb

@@ -17,6 +17,8 @@
 #
 
 require 'spec_helper'
+require 'etc'
+require 'ostruct'
 
 describe Chef::Mixin::EnforceOwnershipAndPermissions do
 
@@ -40,7 +42,17 @@ describe Chef::Mixin::EnforceOwnershipAndPermissions do
     before do
       Chef::FileAccessControl.any_instance.stub(:uid_from_resource).and_return(0)
       Chef::FileAccessControl.any_instance.stub(:requires_changes?).and_return(false)
+
+      passwd_struct = if windows?
+                        Struct::Passwd.new("root", "x", 0, 0, "/root", "/bin/bash")
+                      else
+                        Struct::Passwd.new("root", "x", 0, 0, "root", "/root", "/bin/bash")
+                      end
+      group_struct = OpenStruct.new(:name => "root", :passwd => "x", :gid => 0)
+      Etc.stub!(:getpwuid).and_return(passwd_struct)
+      Etc.stub!(:getgrgid).and_return(group_struct)
     end
+
     it "does not set updated_by_last_action on the new resource" do
       @provider.new_resource.should_not_receive(:updated_by_last_action)
 
@@ -54,6 +66,15 @@ describe Chef::Mixin::EnforceOwnershipAndPermissions do
     before do
       Chef::FileAccessControl.any_instance.stub(:requires_changes?).and_return(true)
       Chef::FileAccessControl.any_instance.stub(:uid_from_resource).and_return(0)
+
+      passwd_struct = if windows?
+                        Struct::Passwd.new("root", "x", 0, 0, "/root", "/bin/bash")
+                      else
+                        Struct::Passwd.new("root", "x", 0, 0, "root", "/root", "/bin/bash")
+                      end
+      group_struct = OpenStruct.new(:name => "root", :passwd => "x", :gid => 0)
+      Etc.stub!(:getpwuid).and_return(passwd_struct)
+      Etc.stub!(:getgrgid).and_return(group_struct)
     end
 
     it "sets updated_by_last_action on the new resource" do

data/spec/unit/provider/cookbook_file_spec.rb

@@ -139,6 +139,8 @@ EXPECTED
     end
 
     it "stages the cookbook to a temporary file" do
+      # prevents file backups where we might not have write access
+      @provider.should_receive(:backup_new_resource) 
       @new_resource.path(@install_to)
       @provider.should_receive(:deploy_tempfile)
       @provider.run_action(:create)

data/spec/unit/provider/cron_spec.rb

@@ -177,6 +177,42 @@ CRONTAB
       end
     end
 
+    context "with a matching entry in the user's crontab using month names and weekday names (#CHEF-3178)" do
+      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
+2 * 1 * * /bin/false
+
+# Another comment
+CRONTAB
+      end
+
+      it "should set cron_exists" do
+        @provider.load_current_resource
+        @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 == '*'
+        cron.hour.should == '5'
+        cron.day.should == '*'
+        cron.month.should == 'Jan'
+        cron.weekday.should == 'Mon'
+        cron.command.should == '/bin/true param1 param2'
+      end
+
+      it "should report the match" do
+        Chef::Log.should_receive(:debug).with("Found cron '#{@new_resource.name}'")
+        @provider.load_current_resource
+      end
+    end
+
     context "with a matching entry without a crontab line" do
       it "should set cron_exists and leave current_resource values at defaults" do
         @provider.stub!(:read_crontab).and_return(<<-CRONTAB)
@@ -263,6 +299,7 @@ CRONTAB
   describe "action_create" do
     before :each do
       @provider.stub!(:write_crontab)
+      @provider.stub!(:read_crontab).and_return(nil)
     end
 
     context "when there is no existing crontab" do
@@ -523,6 +560,14 @@ HOME=/home/foo
       before :each do
         @provider.cron_exists = true
         @provider.stub!(:cron_different?).and_return(false)
+        @provider.stub!(:read_crontab).and_return(<<-CRONTAB)
+0 2 * * * /some/other/command
+
+# Chef Name: something else
+* 5 * * * /bin/true
+
+# Another comment
+CRONTAB
       end
 
       it "should not update the crontab" do
@@ -545,6 +590,7 @@ HOME=/home/foo
   describe "action_delete" do
     before :each do
       @provider.stub!(:write_crontab)
+      @provider.stub!(:read_crontab).and_return(nil)
     end
 
     context "when the user's crontab has no matching section" do

data/spec/unit/provider/deploy_spec.rb

@@ -67,6 +67,18 @@ describe Chef::Provider::Deploy do
     @provider.converge
   end
 
+  it "ensures the deploy_to dir ownership after the verfication that it exists" do
+    @provider.should_receive(:verify_directories_exist).ordered
+    @provider.should_receive(:enforce_ownership).ordered
+    @provider.stub(:copy_cached_repo)
+    @provider.stub(:update_cached_repo)
+    @provider.stub(:install_gems)
+    @provider.stub(:enforce_ownership)
+    @provider.stub(:symlink)
+    @provider.stub(:migrate)
+    @provider.deploy
+  end
+
   it "updates and copies the repo, then does a migrate, symlink, restart, restart, cleanup on deploy" do
     FileUtils.stub(:mkdir_p).with("/my/deploy/dir")
     FileUtils.stub(:mkdir_p).with("/my/deploy/dir/shared")

data/spec/unit/provider/execute_spec.rb

@@ -31,6 +31,9 @@ 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 
+    # FIXME: There should be a test for how STDOUT.tty? changes the live_stream option being passed
+    STDOUT.stub!(:tty?).and_return(true)
   end
 
 

data/spec/unit/provider/file_spec.rb

@@ -18,6 +18,7 @@
 
 
 require 'spec_helper'
+require 'tmpdir'
 
 describe Chef::Provider::File do
   before(:each) do
@@ -113,7 +114,7 @@ describe Chef::Provider::File do
 
   it "should create the file if it is missing, then set the attributes on action_create" do
     @provider.load_current_resource
-    @provider.new_resource.stub!(:path).and_return("/tmp/monkeyfoo")
+    @provider.new_resource.stub!(:path).and_return(File.join(Dir.tmpdir, "monkeyfoo"))
     @provider.access_controls.should_receive(:set_all)
     @provider.should_receive(:diff_current_from_content).and_return("")
     File.stub!(:open).and_return(1)
@@ -127,7 +128,7 @@ describe Chef::Provider::File do
     io = StringIO.new
     @provider.load_current_resource
     @provider.new_resource.content "foobar"
-    @provider.new_resource.stub!(:path).and_return("/tmp/monkeyfoo")
+    @provider.new_resource.stub!(:path).and_return(File.join(Dir.tmpdir, "monkeyfoo"))
     @provider.should_receive(:diff_current_from_content).and_return("")
     File.should_receive(:open).with(@provider.new_resource.path, "w+").and_yield(io)
     @provider.access_controls.should_receive(:set_all)
@@ -137,7 +138,7 @@ describe Chef::Provider::File do
   end
 
   it "should delete the file if it exists and is writable on action_delete" do
-    @provider.new_resource.stub!(:path).and_return("/tmp/monkeyfoo")
+    @provider.new_resource.stub!(:path).and_return(File.join(Dir.tmpdir, "monkeyfoo"))
     @provider.stub!(:backup).and_return(true)
     File.should_receive("exists?").exactly(2).times.with(@provider.new_resource.path).and_return(true)
     File.should_receive("writable?").with(@provider.new_resource.path).and_return(true)
@@ -147,7 +148,7 @@ describe Chef::Provider::File do
   end
 
   it "should not raise an error if it cannot delete the file because it does not exist" do
-    @provider.new_resource.stub!(:path).and_return("/tmp/monkeyfoo")
+    @provider.new_resource.stub!(:path).and_return(File.join(Dir.tmpdir, "monkeyfoo"))
     @provider.stub!(:backup).and_return(true)
     File.should_receive("exists?").exactly(2).times.with(@provider.new_resource.path).and_return(false)
     lambda { @provider.run_action(:delete) }.should_not raise_error()
@@ -156,7 +157,7 @@ describe Chef::Provider::File do
 
   it "should update the atime/mtime on action_touch" do
     @provider.load_current_resource
-    @provider.new_resource.stub!(:path).and_return("/tmp/monkeyfoo")
+    @provider.new_resource.stub!(:path).and_return(File.join(Dir.tmpdir, "monkeyfoo"))
     @provider.should_receive(:diff_current_from_content).and_return("")
     File.should_receive(:utime).once.and_return(1)
     File.stub!(:open).and_return(1)
@@ -281,8 +282,10 @@ describe Chef::Provider::File do
          @resource.path file.path
          @provider = Chef::Provider::File.new(@resource, @run_context) 
          @provider.load_current_resource
-         result = @provider.diff_current_from_content "foo baz\n"
+         result = @provider.diff_current_from_content "foo baz"
          # remove the file name info which varies.
+         require 'pp'
+         pp result
          result.shift(2)
          result.should == ["@@ -0,0 +1 @@", "+foo baz"] 
        end

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

@@ -215,6 +215,19 @@ SHOWPKG_STDOUT
 
       @provider.install_package("irssi", "0.8.12-7")
     end
+
+    it "should run apt-get install with the package name and version and default_release if there is one and provider is explicitly defined" do
+      @provider.should_receive(:run_command_with_systems_locale).with({
+        :command => "apt-get -q -y -o APT::Default-Release=lenny-backports install irssi=0.8.12-7",
+        :environment => {
+          "DEBIAN_FRONTEND" => "noninteractive"
+        }
+      })
+      @new_resource.stub!(:default_release).and_return("lenny-backports")
+      @new_resource.stub!(:provider).and_return("Chef::Provider::Package::Apt")
+
+      @provider.install_package("irssi", "0.8.12-7")
+    end
   end
 
   describe Chef::Provider::Package::Apt, "upgrade_package" do

data/spec/unit/provider/remote_directory_spec.rb

@@ -19,6 +19,11 @@
 require 'spec_helper'
 require 'digest/md5'
 require 'tmpdir'
+require 'chef/mixin/file_class'
+
+class Chef::CFCCheck
+  include Chef::Mixin::FileClass
+end
 
 describe Chef::Provider::RemoteDirectory do
   before do
@@ -153,14 +158,20 @@ describe Chef::Provider::RemoteDirectory do
         @provider.action = :create
         @provider.run_action
 
+        @fclass = Chef::CFCCheck.new
+
         Dir.mktmpdir do |tmp_dir|
-          FileUtils.ln_s(tmp_dir, symlinked_dir_path)
-          ::File.exist?(symlinked_dir_path).should be_true
+          begin
+            @fclass.file_class.symlink(tmp_dir.dup, symlinked_dir_path)
+            ::File.exist?(symlinked_dir_path).should be_true
 
-          @provider.run_action
+            @provider.run_action
 
-          ::File.exist?(symlinked_dir_path).should be_false
-          ::File.exist?(tmp_dir).should be_true
+            ::File.exist?(symlinked_dir_path).should be_false
+            ::File.exist?(tmp_dir).should be_true
+          rescue Chef::Exceptions::Win32APIError => e
+            pending "This must be run as an Administrator to create symlinks"
+          end
         end
       end
     end

data/spec/unit/provider/template_spec.rb

@@ -17,6 +17,8 @@
 #
 require 'stringio'
 require 'spec_helper'
+require 'etc'
+require 'ostruct'
 
 describe Chef::Provider::Template do
   before(:each) do
@@ -38,6 +40,14 @@ describe Chef::Provider::Template do
     @provider.current_resource = @current_resource
     @access_controls = mock("access controls")
     @provider.stub!(:access_controls).and_return(@access_controls)
+    passwd_struct = if windows?
+                      Struct::Passwd.new("root", "x", 0, 0, "/root", "/bin/bash")
+                    else
+                      Struct::Passwd.new("root", "x", 0, 0, "root", "/root", "/bin/bash")
+                    end
+    group_struct = OpenStruct.new(:name => "root", :passwd => "x", :gid => 0)
+    Etc.stub!(:getpwuid).and_return(passwd_struct)
+    Etc.stub!(:getgrgid).and_return(group_struct)
   end
 
   describe "when creating the template" do

data/spec/unit/provider/user/useradd_spec.rb

@@ -199,13 +199,13 @@ describe Chef::Provider::User::Useradd do
     end
 
     it "runs usermod with the computed command options" do
-      @provider.should_receive(:run_command).with({ :command => "usermod -g '23' -d '/Users/mud' adam" }).and_return(true)
+      @provider.should_receive(:run_command).with({ :command => "usermod -g '23' -d '/Users/mud' adam -m" }).and_return(true)
       @provider.manage_user
     end
 
     it "does not set the -r option to usermod" do
       @new_resource.system(true)
-      @provider.should_receive(:run_command).with({ :command => "usermod -g '23' -d '/Users/mud' adam" }).and_return(true)
+      @provider.should_receive(:run_command).with({ :command => "usermod -g '23' -d '/Users/mud' adam -m" }).and_return(true)
       @provider.manage_user
     end
 

data/spec/unit/provider/user_spec.rb

@@ -71,7 +71,7 @@ describe Chef::Provider::User do
       #)
       Chef::Resource::User.stub!(:new).and_return(@current_resource)
       @pw_user = EtcPwnamIsh.new
-      @pw_user.uid = "adam"
+      @pw_user.name = "adam"
       @pw_user.gid = 1000
       @pw_user.uid = 1000
       @pw_user.gecos = "Adam Jacob"
@@ -133,33 +133,44 @@ describe Chef::Provider::User do
     end
 
     describe "and running assertions" do
-      before do
-        # We can only perform one of these tests if the 
-        # ruby-shadow library is installed. 
-        @shadow_lib_unavail = false
+      def self.shadow_lib_unavail?
         begin
+          require 'rubygems'
           require 'shadow'
-        rescue LoadError
-          @shadow_lib_unavail = true
+        rescue LoadError => e
+          pending "ruby-shadow gem not installed for dynamic load test"
+          true
+        else
+          false
         end
       end
 
       before (:each) do
-        # force ruby-shadow library to be required 
         user = @pw_user.dup
+        user.name = "root"
         user.passwd = "x"
         @new_resource.password "some new password"
         Etc.stub!(:getpwnam).and_return(user)
       end
-
-      it "should pass assertions when ruby-shadow can be loaded" do
-        pending "ruby-shadow gem not installed for dynamic load test" if @shadow_lib_unavail
-        puts "SHADOW LIB UNAVAIL: #{@shadow_lib_unavail}"
-        original_method = @provider.method(:require)
-        @provider.should_receive(:require) { |*args| original_method.call(*args) }
-        @provider.load_current_resource
-        @provider.define_resource_requirements
-        @provider.process_resource_requirements
+      
+      unless shadow_lib_unavail?
+        context "and we have the ruby-shadow gem" do
+          pending "and we are not root (rerun this again as root)", :requires_unprivileged_user => true 
+  
+          context "and we are root", :requires_root => true do
+            it "should pass assertions when ruby-shadow can be loaded" do
+              @provider.action = 'create'
+              original_method = @provider.method(:require)
+              @provider.should_receive(:require) { |*args| original_method.call(*args) }
+              passwd_info = Struct::PasswdEntry.new(:sp_namp => "adm ", :sp_pwdp => "$1$T0N0Q.lc$nyG6pFI3Dpqa5cxUz/57j0", :sp_lstchg => 14861, :sp_min => 0, :sp_max => 99999, 
+                                                    :sp_warn => 7, :sp_inact => -1, :sp_expire => -1, :sp_flag => -1)
+              Shadow::Passwd.should_receive(:getspnam).with("adam").and_return(passwd_info)
+              @provider.load_current_resource
+              @provider.define_resource_requirements
+              @provider.process_resource_requirements
+            end
+          end
+        end
       end
 
       it "should fail assertions when ruby-shadow cannot be loaded" do