chef 11.8.4.ohai7.0 → 11.10.0.alpha.1

data/spec/support/platform_helpers.rb

@@ -1,4 +1,7 @@
 require 'fcntl'
+require 'chef/mixin/shell_out'
+
+include Chef::Mixin::ShellOut
 
 def ruby_gte_20?
   RUBY_VERSION.to_f >= 2.0
@@ -32,6 +35,19 @@ def windows_win2k3?
   (host.version && host.version.start_with?("5.2"))
 end
 
+def mac_osx_106?
+  if File.exists? "/usr/bin/sw_vers"
+    result = shell_out("/usr/bin/sw_vers")
+    result.stdout.each_line do |line|
+      if line =~ /^ProductVersion:\s10.6.*$/
+        return true
+      end
+    end
+  end
+
+  false
+end
+
 # detects if the hardware is 64-bit (evaluates to true in "WOW64" mode in a 32-bit app on a 64-bit system)
 def windows64?
   windows? && ( ENV['PROCESSOR_ARCHITECTURE'] == 'AMD64' || ENV['PROCESSOR_ARCHITEW6432'] == 'AMD64' )
@@ -95,3 +111,8 @@ end
 def suse?
   File.exists?("/etc/SuSE-release")
 end
+
+def root?
+  return false if windows?
+  Process.euid == 0
+end

data/spec/support/shared/functional/windows_script.rb

@@ -23,7 +23,8 @@ shared_context Chef::Resource::WindowsScript do
   before(:all) do
 
     ohai_reader = Ohai::System.new
-    ohai_reader.all_plugins("platform")
+    ohai_reader.require_plugin("os")
+    ohai_reader.require_plugin("windows::platform")
 
     new_node = Chef::Node.new
     new_node.consume_external_attrs(ohai_reader.data,{})

data/spec/support/shared/unit/provider/file.rb

@@ -35,46 +35,75 @@ def normalized_path
   File.expand_path(resource_path)
 end
 
+# forwards-vs-reverse slashes on windows sucks
+def windows_path
+  windows? ? normalized_path.gsub(/\\/, '/') : normalized_path
+end
+
+# this is all getting a bit stupid, CHEF-4802 cut to remove all this
 def setup_normal_file
-  File.stub!(:exists?).with(resource_path).and_return(true)
-  File.stub!(:directory?).with(resource_path).and_return(false)
-  File.stub!(:directory?).with(enclosing_directory).and_return(true)
-  File.stub!(:writable?).with(resource_path).and_return(true)
-  file_symlink_class.stub!(:symlink?).with(resource_path).and_return(false)
-  file_symlink_class.stub!(:symlink?).with(normalized_path).and_return(false)
+  [ resource_path, normalized_path, windows_path].each do |path|
+    File.stub(:file?).with(path).and_return(true)
+    File.stub(:exists?).with(path).and_return(true)
+    File.stub(:exist?).with(path).and_return(true)
+    File.stub(:directory?).with(path).and_return(false)
+    File.stub(:writable?).with(path).and_return(true)
+    file_symlink_class.stub(:symlink?).with(path).and_return(false)
+    File.stub(:realpath?).with(path).and_return(normalized_path)
+  end
+  File.stub(:directory?).with(enclosing_directory).and_return(true)
 end
 
 def setup_missing_file
-  File.stub!(:exists?).with(resource_path).and_return(false)
-  File.stub!(:directory?).with(resource_path).and_return(false)
-  File.stub!(:directory?).with(enclosing_directory).and_return(true)
-  File.stub!(:writable?).with(resource_path).and_return(false)
-  file_symlink_class.stub!(:symlink?).with(resource_path).and_return(false)
+  [ resource_path, normalized_path, windows_path].each do |path|
+    File.stub(:file?).with(path).and_return(false)
+    File.stub(:realpath?).with(path).and_return(resource_path)
+    File.stub(:exists?).with(path).and_return(false)
+    File.stub(:exist?).with(path).and_return(false)
+    File.stub(:directory?).with(path).and_return(false)
+    File.stub(:writable?).with(path).and_return(false)
+    file_symlink_class.stub(:symlink?).with(path).and_return(false)
+  end
+  File.stub(:directory?).with(enclosing_directory).and_return(true)
 end
 
 def setup_symlink
-  File.stub!(:exists?).with(resource_path).and_return(true)
-  File.stub!(:directory?).with(normalized_path).and_return(false)
-  File.stub!(:directory?).with(enclosing_directory).and_return(true)
-  File.stub!(:writable?).with(resource_path).and_return(true)
-  file_symlink_class.stub!(:symlink?).with(resource_path).and_return(true)
-  file_symlink_class.stub!(:symlink?).with(normalized_path).and_return(true)
+  [ resource_path, normalized_path, windows_path].each do |path|
+    File.stub(:file?).with(path).and_return(true)
+    File.stub(:realpath?).with(path).and_return(normalized_path)
+    File.stub(:exists?).with(path).and_return(true)
+    File.stub(:exist?).with(path).and_return(true)
+    File.stub(:directory?).with(path).and_return(false)
+    File.stub(:writable?).with(path).and_return(true)
+    file_symlink_class.stub(:symlink?).with(path).and_return(true)
+  end
+  File.stub(:directory?).with(enclosing_directory).and_return(true)
 end
 
 def setup_unwritable_file
-  File.stub!(:exists?).with(resource_path).and_return(true)
-  File.stub!(:directory?).with(resource_path).and_return(false)
-  File.stub!(:directory?).with(enclosing_directory).and_return(true)
-  File.stub!(:writable?).with(resource_path).and_return(false)
-  file_symlink_class.stub!(:symlink?).with(resource_path).and_return(false)
+  [ resource_path, normalized_path, windows_path].each do |path|
+    File.stub(:file?).with(path).and_return(false)
+    File.stub(:realpath?).with(path).and_raise(Errno::ENOENT)
+    File.stub(:exists?).with(path).and_return(true)
+    File.stub(:exist?).with(path).and_return(true)
+    File.stub(:directory?).with(path).and_return(false)
+    File.stub(:writable?).with(path).and_return(false)
+    file_symlink_class.stub(:symlink?).with(path).and_return(false)
+  end
+  File.stub(:directory?).with(enclosing_directory).and_return(true)
 end
 
 def setup_missing_enclosing_directory
-  File.stub!(:exists?).with(resource_path).and_return(false)
-  File.stub!(:directory?).with(resource_path).and_return(false)
-  File.stub!(:directory?).with(enclosing_directory).and_return(false)
-  File.stub!(:writable?).with(resource_path).and_return(false)
-  file_symlink_class.stub!(:symlink?).with(resource_path).and_return(false)
+  [ resource_path, normalized_path, windows_path].each do |path|
+    File.stub(:file?).with(path).and_return(false)
+    File.stub(:realpath?).with(path).and_raise(Errno::ENOENT)
+    File.stub(:exists?).with(path).and_return(false)
+    File.stub(:exist?).with(path).and_return(false)
+    File.stub(:directory?).with(path).and_return(false)
+    File.stub(:writable?).with(path).and_return(false)
+    file_symlink_class.stub(:symlink?).with(path).and_return(false)
+  end
+  File.stub(:directory?).with(enclosing_directory).and_return(false)
 end
 
 shared_examples_for Chef::Provider::File do
@@ -93,63 +122,109 @@ shared_examples_for Chef::Provider::File do
 
   context "when loading the current resource" do
 
+    context "when running load_current_resource" do
+      #
+      # the content objects need the current_resource to be loaded (esp remote_file), so calling
+      # for content inside of load_current_resource is totally crossing the streams...
+      #
+      it "should not try to load the content when the file is present" do
+        setup_normal_file
+        provider.should_not_receive(:tempfile)
+        provider.should_not_receive(:content)
+        provider.load_current_resource
+      end
+
+      it "should not try to load the content when the file is missing" do
+        setup_missing_file
+        provider.should_not_receive(:tempfile)
+        provider.should_not_receive(:content)
+        provider.load_current_resource
+      end
+    end
+
     context "when running load_current_resource and the file exists" do
       before do
         setup_normal_file
-        provider.load_current_resource
       end
 
+      let(:tempfile_sha256) { "42971f0ddce0cb20cf7660a123ffa1a1543beb2f1e7cd9d65858764a27f3201d" }
+
       it "should load a current resource based on the one specified at construction" do
+        provider.load_current_resource
         provider.current_resource.should be_a_kind_of(Chef::Resource::File)
       end
 
       it "the loaded current_resource name should be the same as the resource name" do
+        provider.load_current_resource
         provider.current_resource.name.should eql(resource.name)
       end
 
       it "the loaded current_resource path should be the same as the resoure path" do
+        provider.load_current_resource
         provider.current_resource.path.should eql(resource.path)
       end
 
       it "the loaded current_resource content should be nil" do
+        provider.load_current_resource
         provider.current_resource.content.should eql(nil)
       end
+
+      it "it should call checksum if we are managing content" do
+        provider.should_receive(:managing_content?).at_least(:once).and_return(true)
+        provider.should_receive(:checksum).with(resource.path).and_return(tempfile_sha256)
+        provider.load_current_resource
+      end
+
+      it "it should not call checksum if we are not managing content" do
+        provider.should_receive(:managing_content?).at_least(:once).and_return(false)
+        provider.should_not_receive(:checksum)
+        provider.load_current_resource
+      end
     end
 
     context "when running load_current_resource and the file does not exist" do
       before do
         setup_missing_file
-        provider.load_current_resource
       end
 
       it "the current_resource should be a Chef::Resource::File" do
+        provider.load_current_resource
         provider.current_resource.should be_a_kind_of(Chef::Resource::File)
       end
 
       it "the current_resource name should be the same as the resource name" do
+        provider.load_current_resource
         provider.current_resource.name.should eql(resource.name)
       end
 
       it "the current_resource path should be the same as the resource path" do
+        provider.load_current_resource
         provider.current_resource.path.should eql(resource.path)
       end
 
       it "the loaded current_resource content should be nil" do
+        provider.load_current_resource
         provider.current_resource.content.should eql(nil)
       end
+
+      it "it should not call checksum if we are not managing content" do
+        provider.should_not_receive(:managing_content?)
+        provider.should_not_receive(:checksum)
+        provider.load_current_resource
+      end
     end
 
     context "examining file security metadata on Unix with a file that exists" do
       before do
         # fake that we're on unix even if we're on windows
-        Chef::Platform.stub!(:windows?).and_return(false)
+        Chef::Platform.stub(:windows?).and_return(false)
         # mock up the filesystem to behave like unix
         setup_normal_file
         stat_struct = mock("::File.stat", :mode => 0600, :uid => 0, :gid => 0, :mtime => 10000)
         resource_real_path = File.realpath(resource.path)
         File.should_receive(:stat).with(resource_real_path).at_least(:once).and_return(stat_struct)
-        Etc.stub!(:getgrgid).with(0).and_return(mock("Group Ent", :name => "wheel"))
-        Etc.stub!(:getpwuid).with(0).and_return(mock("User Ent", :name => "root"))
+        Etc.stub(:getgrgid).with(0).and_return(mock("Group Ent", :name => "wheel"))
+        Etc.stub(:getpwuid).with(0).and_return(mock("User Ent", :name => "root"))
       end
 
       context "when the new_resource does not specify any state" do
@@ -218,7 +293,7 @@ shared_examples_for Chef::Provider::File do
     context "examining file security metadata on Unix with a file that does not exist" do
       before do
         # fake that we're on unix even if we're on windows
-        Chef::Platform.stub!(:windows?).and_return(false)
+        Chef::Platform.stub(:windows?).and_return(false)
         setup_missing_file
       end
 
@@ -267,14 +342,14 @@ shared_examples_for Chef::Provider::File do
 
     before do
       # fake that we're on unix even if we're on windows
-      Chef::Platform.stub!(:windows?).and_return(false)
+      Chef::Platform.stub(:windows?).and_return(false)
       # mock up the filesystem to behave like unix
       setup_normal_file
       stat_struct = mock("::File.stat", :mode => 0600, :uid => 0, :gid => 0, :mtime => 10000)
       resource_real_path = File.realpath(resource.path)
-      File.stub!(:stat).with(resource_real_path).and_return(stat_struct)
-      Etc.stub!(:getgrgid).with(0).and_return(mock("Group Ent", :name => "wheel"))
-      Etc.stub!(:getpwuid).with(0).and_return(mock("User Ent", :name => "root"))
+      File.stub(:stat).with(resource_real_path).and_return(stat_struct)
+      Etc.stub(:getgrgid).with(0).and_return(mock("Group Ent", :name => "wheel"))
+      Etc.stub(:getpwuid).with(0).and_return(mock("User Ent", :name => "root"))
       provider.send(:load_resource_attributes_from_file, resource)
     end
 
@@ -368,7 +443,7 @@ shared_examples_for Chef::Provider::File do
           setup_normal_file
           provider.load_current_resource
           tempfile = double('Tempfile', :path => "/tmp/foo-bar-baz")
-          content.stub!(:tempfile).and_return(tempfile)
+          content.stub(:tempfile).and_return(tempfile)
           File.should_receive(:exists?).with("/tmp/foo-bar-baz").and_return(true)
           tempfile.should_receive(:unlink).once
         end
@@ -378,11 +453,12 @@ shared_examples_for Chef::Provider::File do
           let(:tempfile_sha256) { "42971f0ddce0cb20cf7660a123ffa1a1543beb2f1e7cd9d65858764a27f3201d" }
           let(:diff_for_reporting) { "+++\n---\n+foo\n-bar\n" }
           before do
-            provider.stub!(:contents_changed?).and_return(true)
+            provider.stub(:contents_changed?).and_return(true)
             diff = double('Diff', :for_output => ['+++','---','+foo','-bar'],
                                   :for_reporting => diff_for_reporting )
-            diff.stub!(:diff).with(resource_path, tempfile_path).and_return(true)
+            diff.stub(:diff).with(resource_path, tempfile_path).and_return(true)
             provider.should_receive(:diff).at_least(:once).and_return(diff)
+            provider.should_receive(:managing_content?).at_least(:once).and_return(true)
             provider.should_receive(:checksum).with(tempfile_path).and_return(tempfile_sha256)
             provider.should_receive(:checksum).with(resource_path).and_return(tempfile_sha256)
             provider.deployment_strategy.should_receive(:deploy).with(tempfile_path, normalized_path)
@@ -406,7 +482,7 @@ shared_examples_for Chef::Provider::File do
         end
 
         it "does nothing when the contents have not changed"  do
-          provider.stub!(:contents_changed?).and_return(false)
+          provider.stub(:contents_changed?).and_return(false)
           provider.should_not_receive(:diff)
           provider.send(:do_contents_changes)
         end
@@ -443,7 +519,7 @@ shared_examples_for Chef::Provider::File do
         before do
           setup_normal_file
           provider.load_current_resource
-          provider.stub!(:resource_updated?).and_return(true)
+          provider.stub(:resource_updated?).and_return(true)
         end
 
         it "should check for selinux_enabled? by default" do
@@ -508,7 +584,7 @@ shared_examples_for Chef::Provider::File do
 
       context "when resource is not updated" do
         before do
-          provider.stub!(:resource_updated?).and_return(false)
+          provider.stub(:resource_updated?).and_return(false)
         end
 
         it "should not check for selinux_enabled?" do
@@ -607,3 +683,65 @@ shared_examples_for Chef::Provider::File do
 
 end
 
+shared_examples_for "a file provider with content field" do
+  context "when testing managing_content?" do
+    it "should be false when creating a file without content" do
+      provider.action = :create
+      resource.stub(:content).and_return(nil)
+      resource.stub(:checksum).and_return(nil)
+      expect(provider.send(:managing_content?)).to be_false
+    end
+    it "should be true when creating a file with content" do
+      provider.action = :create
+      resource.stub(:content).and_return("flurbleblobbleblooble")
+      resource.stub(:checksum).and_return(nil)
+      expect(provider.send(:managing_content?)).to be_true
+    end
+    it "should be true when checksum is set on the content (no matter how crazy)" do
+      provider.action = :create_if_missing
+      resource.stub(:checksum).and_return("1234123234234234")
+      resource.stub(:content).and_return(nil)
+      expect(provider.send(:managing_content?)).to be_true
+    end
+    it "should be false when action is create_if_missing" do
+      provider.action = :create_if_missing
+      resource.stub(:content).and_return("flurbleblobbleblooble")
+      resource.stub(:checksum).and_return(nil)
+      expect(provider.send(:managing_content?)).to be_false
+    end
+  end
+end
+
+shared_examples_for "a file provider with source field" do
+  context "when testing managing_content?" do
+    it "should be false when creating a file without content" do
+      provider.action = :create
+      resource.stub(:content).and_return(nil)
+      resource.stub(:source).and_return(nil)
+      resource.stub(:checksum).and_return(nil)
+      expect(provider.send(:managing_content?)).to be_false
+    end
+    it "should be true when creating a file with content" do
+      provider.action = :create
+      resource.stub(:content).and_return(nil)
+      resource.stub(:source).and_return("http://somewhere.com/something.php")
+      resource.stub(:checksum).and_return(nil)
+      expect(provider.send(:managing_content?)).to be_true
+    end
+    it "should be true when checksum is set on the content (no matter how crazy)" do
+      provider.action = :create_if_missing
+      resource.stub(:content).and_return(nil)
+      resource.stub(:source).and_return(nil)
+      resource.stub(:checksum).and_return("1234123234234234")
+      expect(provider.send(:managing_content?)).to be_true
+    end
+    it "should be false when action is create_if_missing" do
+      provider.action = :create_if_missing
+      resource.stub(:content).and_return(nil)
+      resource.stub(:source).and_return("http://somewhere.com/something.php")
+      resource.stub(:checksum).and_return(nil)
+      expect(provider.send(:managing_content?)).to be_false
+    end
+  end
+end
+

data/spec/support/shared/unit/provider/useradd_based_user_provider.rb

@@ -335,6 +335,24 @@ shared_examples_for "a useradd-based user provider" do |supported_useradd_option
         lambda { provider.check_lock }.should raise_error(Mixlib::ShellOut::ShellCommandFailed)
       end
     end
+
+    context "when in why run mode" do
+      before do
+        passwd_status = mock("Mixlib::ShellOut command", :exitstatus => 0, :stdout => "", :stderr => "passwd: user 'chef-test' does not exist\n")
+        provider.should_receive(:shell_out!).
+          with("passwd", "-S", @new_resource.username, {:returns=>[0, 1]}).
+          and_return(passwd_status)
+        Chef::Config[:why_run] = true
+      end
+  
+      it "should return false if the user does not exist" do
+        provider.check_lock.should eql(false)
+      end
+
+      it "should not raise an error if the user does not exist" do
+        lambda { provider.check_lock }.should_not raise_error
+      end
+    end
   end
 
   describe "when locking the user" do

data/spec/unit/application/client_spec.rb

@@ -26,6 +26,7 @@ describe Chef::Application::Client, "reconfigure" do
     @app.stub!(:configure_opt_parser).and_return(true)
     @app.stub!(:configure_chef).and_return(true)
     @app.stub!(:configure_logging).and_return(true)
+    @app.cli_arguments = []
     Chef::Config[:interval] = 10
 
     Chef::Config[:once] = false

data/spec/unit/client_spec.rb

@@ -169,7 +169,6 @@ shared_examples_for Chef::Client do
 
     it "should identify the node and run ohai, then register the client" do
       mock_chef_rest_for_node = mock("Chef::REST (node)")
-      mock_chef_rest_for_client = mock("Chef::REST (client)")
       mock_chef_rest_for_node_save = mock("Chef::REST (node save)")
       mock_chef_runner = mock("Chef::Runner")
 
@@ -448,6 +447,20 @@ shared_examples_for Chef::Client do
     end
   end
 
+  describe "assert_cookbook_path_not_empty" do
+    before do
+      Chef::Config[:solo] = true
+      Chef::Config[:cookbook_path] = ["/path/to/invalid/cookbook_path"]
+    end
+    context "when any directory of cookbook_path contains no cookbook" do
+      it "raises CookbookNotFound error" do
+        expect do
+          @client.send(:assert_cookbook_path_not_empty, nil)
+        end.to raise_error(Chef::Exceptions::CookbookNotFound, 'None of the cookbook paths set in Chef::Config[:cookbook_path], ["/path/to/invalid/cookbook_path"], contain any cookbooks')
+      end
+    end
+  end
+
 end
 
 describe Chef::Client do