chef 11.4.4 → 11.6.0.hotfix.1

data/spec/unit/chef_fs/file_system_spec.rb

@@ -17,7 +17,6 @@
 #
 
 require 'spec_helper'
-require 'support/shared/unit/file_system_support'
 require 'chef/chef_fs/file_system'
 require 'chef/chef_fs/file_pattern'
 
@@ -35,7 +34,7 @@ describe Chef::ChefFS::FileSystem do
         list_should_yield_paths(fs, '/a', '/a')
       end
       it '/a/b' do
-        list_should_yield_paths(fs, '/a/b')
+        list_should_yield_paths(fs, '/a/b', '/a/b')
       end
       it '/*' do
         list_should_yield_paths(fs, '/*', '/')
@@ -105,7 +104,7 @@ describe Chef::ChefFS::FileSystem do
       end
       it 'nonexistent /a/ab/blah/bjork' do
         no_blocking_calls_allowed
-        list_should_yield_paths(fs, '/a/ab/blah/bjork')
+        list_should_yield_paths(fs, '/a/ab/blah/bjork', '/a/ab/blah/bjork')
       end
     end
 

data/spec/unit/client_spec.rb

@@ -232,7 +232,7 @@ shared_examples_for Chef::Client do
       @client.should_receive(:run_started)
       @client.should_receive(:run_completed_successfully)
 
-      if(Chef::Config[:client_fork])
+      if(Chef::Config[:client_fork] && !windows?)
         require 'stringio'
         if(Chef::Config[:pipe_node])
           pipe_sim = StringIO.new
@@ -263,6 +263,25 @@ shared_examples_for Chef::Client do
       end
     end
 
+    it "should remove the run_lock on failure of #load_node" do
+      @run_lock = mock("Chef::RunLock", :acquire => true)
+      Chef::RunLock.stub!(:new).and_return(@run_lock)
+
+      @events = mock("Chef::EventDispatch::Dispatcher").as_null_object
+      Chef::EventDispatch::Dispatcher.stub!(:new).and_return(@events)
+
+      # @events is created on Chef::Client.new, so we need to recreate it after mocking
+      @client = Chef::Client.new
+      @client.stub!(:load_node).and_raise(Exception)
+      @run_lock.should_receive(:release)
+      if(Chef::Config[:client_fork] && !windows?)
+        @client.should_receive(:fork) do |&block|
+          block.call
+        end
+      end
+      lambda { @client.run }.should raise_error(Exception)
+    end
+
     describe "when notifying other objects of the status of the chef run" do
       before do
         Chef::Client.clear_notifications

data/spec/unit/config_spec.rb

@@ -1,5 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Kyle Goodwin (<kgoodwin@primerevenue.com>)
 # Copyright:: Copyright (c) 2008 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -17,6 +18,7 @@
 #
 
 require 'spec_helper'
+require 'chef/exceptions'
 
 describe Chef::Config do
   before(:all) do
@@ -24,42 +26,36 @@ describe Chef::Config do
     @original_env = { 'HOME' => ENV['HOME'], 'SYSTEMDRIVE' => ENV['SYSTEMDRIVE'], 'HOMEPATH' => ENV['HOMEPATH'], 'USERPROFILE' => ENV['USERPROFILE'] }
   end
 
-  shared_examples_for "server URL" do
-    it "should set the registration url" do
-      Chef::Config.registration_url.should == "https://junglist.gen.nz"
+  describe "config attribute writer: chef_server_url" do
+    before do
+      Chef::Config.chef_server_url = "https://junglist.gen.nz"
     end
 
-    it "should set the template url" do
-      Chef::Config.template_url.should == "https://junglist.gen.nz"
+    it "sets the server url" do
+      Chef::Config.chef_server_url.should == "https://junglist.gen.nz"
     end
 
-    it "should set the remotefile url" do
-      Chef::Config.remotefile_url.should == "https://junglist.gen.nz"
-    end
+    context "when the url has a leading space" do
+      before do
+        Chef::Config.chef_server_url = " https://junglist.gen.nz"
+      end
 
-    it "should set the search url" do
-      Chef::Config.search_url.should == "https://junglist.gen.nz"
-    end
+      it "strips the space from the url when setting" do
+        Chef::Config.chef_server_url.should == "https://junglist.gen.nz"
+      end
 
-    it "should set the role url" do
-      Chef::Config.role_url.should == "https://junglist.gen.nz"
     end
-  end
 
-  describe "config attribute writer: chef_server_url" do
-    before do
-      Chef::Config.chef_server_url = "https://junglist.gen.nz"
-    end
-    
-    it_behaves_like "server URL"
-  end
+    context "when the url is a frozen string" do
+      before do
+        Chef::Config.chef_server_url = " https://junglist.gen.nz".freeze
+      end
 
-  context "when the url has a leading space" do
-    before do
-      Chef::Config.chef_server_url = " https://junglist.gen.nz"
+      it "strips the space from the url when setting without raising an error" do
+        Chef::Config.chef_server_url.should == "https://junglist.gen.nz"
+      end
     end
-    
-    it_behaves_like "server URL"
+
   end
 
   describe "when configuring formatters" do
@@ -106,14 +102,6 @@ describe Chef::Config do
 
   end
 
-  context "when the url is a frozen string" do
-    before do
-      Chef::Config.chef_server_url = " https://junglist.gen.nz".freeze
-    end
-
-    it_behaves_like "server URL"
-  end
-
   describe "class method: manage_secret_key" do
     before do
       Chef::FileCache.stub!(:load).and_return(true)
@@ -131,7 +119,7 @@ describe Chef::Config do
       end
 
       it "should not generate and store a chef server cookie id" do
-        Chef::FileCache.should_not_receive(:store).with("chef_server_cookie_id", /\w{40}/).and_return(true)
+        Chef::FileCache.should_not_receive(:store).with("chef_server_cookie_id", /\w{40}/)
         Chef::Config.manage_secret_key
       end
     end
@@ -165,19 +153,7 @@ describe Chef::Config do
     end
   end
 
-  describe "class method: openid_providers=" do
-    it "should not log an appropriate deprecation info message" do
-      Chef::Log.should_not_receive(:info).with("DEPRECATION: openid_providers will be removed, please use authorized_openid_providers").and_return(true)
-      Chef::Config.openid_providers = %w{opscode.com junglist.gen.nz}
-    end
-
-    it "should internally configure authorized_openid_providers with the value given" do
-      Chef::Config.should_receive(:configure).and_return(%w{opscode.com junglist.gen.nz})
-      Chef::Config.openid_providers = %w{opscode.com junglist.gen.nz}
-    end
-  end
-
-   describe "class method: plaform_specific_path" do
+  describe "class method: plaform_specific_path" do
     it "should return given path on non-windows systems" do
       platform_mock :unix do
         path = "/etc/chef/cookbooks"
@@ -230,13 +206,19 @@ describe Chef::Config do
     end
 
     it "Chef::Config[:data_bag_path] defaults to /var/chef/data_bags" do
-      data_bag_path = if windows?
-        "C:\\chef\\data_bags"
+      data_bag_path =
+        Chef::Config.platform_specific_path("/var/chef/data_bags")
+      Chef::Config[:data_bag_path].should == data_bag_path
+    end
+
+    it "Chef::Config[:environment_path] defaults to /var/chef/environments" do
+      environment_path = if windows?
+        "C:\\chef\\environments"
       else
-        "/var/chef/data_bags"
+        "/var/chef/environments"
       end
 
-      Chef::Config[:data_bag_path].should == data_bag_path
+      Chef::Config[:environment_path].should == environment_path
     end
   end
 
@@ -261,6 +243,42 @@ describe Chef::Config do
     end
   end
 
+  describe "Chef::Config[:encrypted_data_bag_secret]" do
+    db_secret_default_path =
+      Chef::Config.platform_specific_path("/etc/chef/encrypted_data_bag_secret")
+
+    let(:db_secret_default_path){ db_secret_default_path }
+
+    before do
+      File.stub(:exist?).with(db_secret_default_path).and_return(secret_exists)
+      # ugh...the only way to properly test this since the conditional
+      # is evaluated at file load/require time.
+      $LOADED_FEATURES.delete_if{|f| f =~ /chef\/config\.rb/}
+      require 'chef/config'
+    end
+
+    context "#{db_secret_default_path} exists" do
+      let(:secret_exists) { true }
+      it "sets the value to #{db_secret_default_path}" do
+        Chef::Config[:encrypted_data_bag_secret].should eq db_secret_default_path
+      end
+    end
+
+    context "#{db_secret_default_path} does not exist" do
+      let(:secret_exists) { false }
+      it "sets the value to nil" do
+        Chef::Config[:encrypted_data_bag_secret].should be_nil
+      end
+    end
+  end
+
+  describe "Chef::Config[:log_location]" do
+    it "raises ConfigurationError when log_location directory is missing" do
+      missing_path = "/tmp/non-existing-dir/file"
+      expect{Chef::Config.log_location = missing_path}.to raise_error Chef::Exceptions::ConfigurationError
+    end
+  end
+
   after(:each) do
     Chef::Config.configuration = @original_config
   end

data/spec/unit/cookbook/synchronizer_spec.rb

@@ -63,6 +63,7 @@ describe Chef::CookbookSynchronizer do
                                    "checksum" => "abc456" }
     @cookbook_a_manifest["attributes"] = [ @cookbook_a_default_attrs ]
     @cookbook_a_manifest["templates"] = [{"path" => "templates/default/apache2.conf.erb", "url" => "http://chef.example.com/ffffff"}]
+    @cookbook_a_manifest["files"] = [{"path" => "files/default/megaman.conf", "url" => "http://chef.example.com/megaman.conf"}]
     @cookbook_a.manifest = @cookbook_a_manifest
     @cookbook_manifest["cookbook_a"] = @cookbook_a
 
@@ -102,7 +103,7 @@ describe Chef::CookbookSynchronizer do
     before do
       # Would rather not stub out methods on the test subject, but setting up
       # the state is a PITA and tests for this behavior are above.
-      @synchronizer.should_receive(:clear_obsoleted_cookbooks)
+      @synchronizer.stub!(:clear_obsoleted_cookbooks)
 
       @server_api = mock("Chef::REST (mock)")
       @file_cache = mock("Chef::FileCache (mock)")
@@ -162,6 +163,53 @@ describe Chef::CookbookSynchronizer do
         @synchronizer.sync_cookbooks
       end
 
+      context "Chef::Config[:no_lazy_load] is true" do
+        before do
+          Chef::Config[:no_lazy_load] = true
+          @synchronizer = Chef::CookbookSynchronizer.new(@cookbook_manifest, @events)
+          @synchronizer.stub!(:server_api).and_return(@server_api)
+          @synchronizer.stub!(:cache).and_return(@file_cache)
+          @synchronizer.stub!(:clear_obsoleted_cookbooks)
+
+          @cookbook_a_file_default_tempfile = mock("Tempfile for cookbook_a megaman.conf file",
+                                                     :path => "/tmp/cookbook_a_file_default_tempfile")
+          @cookbook_a_template_default_tempfile = mock("Tempfile for cookbook_a apache.conf.erb template",
+                                                     :path => "/tmp/cookbook_a_template_default_tempfile")
+        end
+  
+        after do
+          Chef::Config[:no_lazy_load] = false
+        end
+  
+        it "fetches templates and cookbook files" do
+          @file_cache.should_receive(:has_key?).
+            with("cookbooks/cookbook_a/files/default/megaman.conf").
+            and_return(false)
+          @file_cache.should_receive(:has_key?).
+            with("cookbooks/cookbook_a/templates/default/apache2.conf.erb").
+            and_return(false)
+
+          @server_api.should_receive(:get_rest).
+            with('http://chef.example.com/megaman.conf', true).
+            and_return(@cookbook_a_file_default_tempfile)
+          @file_cache.should_receive(:move_to).
+            with("/tmp/cookbook_a_file_default_tempfile", "cookbooks/cookbook_a/files/default/megaman.conf")
+          @file_cache.should_receive(:load).
+            with("cookbooks/cookbook_a/files/default/megaman.conf", false).
+            and_return("/file-cache/cookbooks/cookbook_a/default/megaman.conf")
+
+          @server_api.should_receive(:get_rest).
+            with('http://chef.example.com/ffffff', true).
+            and_return(@cookbook_a_template_default_tempfile)
+          @file_cache.should_receive(:move_to).
+            with("/tmp/cookbook_a_template_default_tempfile", "cookbooks/cookbook_a/templates/default/apache2.conf.erb")
+          @file_cache.should_receive(:load).
+            with("cookbooks/cookbook_a/templates/default/apache2.conf.erb", false).
+            and_return("/file-cache/cookbooks/cookbook_a/templates/default/apache2.conf.erb")
+  
+          @synchronizer.sync_cookbooks
+        end
+      end
     end
 
     context "when the cache contains outdated files" do

data/spec/unit/cookbook/syntax_check_spec.rb

@@ -33,9 +33,15 @@ describe Chef::Cookbook::SyntaxCheck do
     @defn_files = %w{client.rb server.rb}.map { |f| File.join(cookbook_path, 'definitions', f)}
     @recipes = %w{default.rb gigantor.rb one.rb}.map { |f| File.join(cookbook_path, 'recipes', f) }
     @ruby_files = @attr_files + @defn_files + @recipes
-
-    @template_files = %w{openldap_stuff.conf.erb openldap_variable_stuff.conf.erb test.erb}.map { |f| File.join(cookbook_path, 'templates', 'default', f)}
-
+    basenames = %w{ helpers_via_partial_test.erb
+                    helper_test.erb
+                    openldap_stuff.conf.erb
+                    openldap_variable_stuff.conf.erb
+                    test.erb
+                    some_windows_line_endings.erb
+                    all_windows_line_endings.erb
+                    no_windows_line_endings.erb }
+    @template_files = basenames.map { |f| File.join(cookbook_path, 'templates', 'default', f)}
   end
 
   it "creates a syntax checker given the cookbook name when Chef::Config.cookbook_path is set" do
@@ -128,6 +134,25 @@ describe Chef::Cookbook::SyntaxCheck do
 
       end
 
+      describe "and an ignored file has a syntax error" do
+        before do
+          cookbook_path = File.join(CHEF_SPEC_DATA, 'cookbooks', 'ignorken')
+          Chef::Config[:cookbook_path] = File.dirname(cookbook_path)
+          syntax_check.cookbook_path.replace(cookbook_path)
+          @ruby_files = [File.join(cookbook_path, 'recipes/default.rb')]
+        end
+
+        it "shows that ignored ruby files do not require a syntax check" do
+          syntax_check.untested_ruby_files.sort.should == @ruby_files.sort
+        end
+
+        it "does not indicate that a ruby file has a syntax error" do
+          syntax_check.validate_ruby_files.should be_true
+          syntax_check.untested_ruby_files.should be_empty
+        end
+
+      end
+
     end
 
     describe "and the files have been syntax checked previously" do

data/spec/unit/cookbook_loader_spec.rb

@@ -66,8 +66,9 @@ describe Chef::CookbookLoader do
         seen[0].should == "angrybash"
         seen[1].should == "apache2"
         seen[2].should == "borken"
-        seen[3].should == "java"
-        seen[4].should == "openldap"
+        seen[3].should == "ignorken"
+        seen[4].should == "java"
+        seen[5].should == "openldap"
       end
     end
   

data/spec/unit/daemon_spec.rb

@@ -154,30 +154,30 @@ describe Chef::Daemon 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
@@ -295,7 +295,7 @@ describe Chef::Daemon do
       it "should log an appropriate error message and fail miserably" do
         Process.stub!(:initgroups).and_raise(Errno::EPERM)
         error = "Operation not permitted"
-        if RUBY_PLATFORM.match("solaris2")
+        if RUBY_PLATFORM.match("solaris2") || RUBY_PLATFORM.match("aix")
           error = "Not owner"
         end
         Chef::Application.should_receive(:fatal!).with("Permission denied when trying to change 999:999 to 501:20. #{error}")

data/spec/unit/data_bag_spec.rb

@@ -155,6 +155,13 @@ describe Chef::DataBag do
         data_bag.should == { 'bar' => { 'id' => 'bar', 'name' => 'Bob Bar' }, 'baz' => { 'id' => 'baz', 'name' => 'John Baz' }}
       end
 
+      it "should return the data bag list" do
+        File.should_receive(:directory?).with('/var/chef/data_bags').and_return(true)
+        Dir.should_receive(:glob).and_return(["/var/chef/data_bags/foo", "/var/chef/data_bags/bar"])
+        data_bag_list = Chef::DataBag.list
+        data_bag_list.should == { 'bar' => 'bar', 'foo' => 'foo' }
+      end
+
       it 'should raise an error if the configured data_bag_path is invalid' do
         File.should_receive(:directory?).with('/var/chef/data_bags').and_return(false)
 

data/spec/unit/deprecation_spec.rb

@@ -0,0 +1,86 @@
+#
+# Author:: Serdar Sutay (<serdar@opscode.com>)
+# Copyright:: Copyright (c) 2013 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 'spec_helper'
+require 'chef/deprecation/warnings'
+
+describe Chef::Deprecation do
+
+  # Support code for Chef::Deprecation
+
+  def self.class_from_string(str)
+    str.split('::').inject(Object) do |mod, class_name|
+      mod.const_get(class_name)
+    end
+  end
+
+  module DeprecatedMethods
+    def deprecated_method(value)
+      @value = value
+    end
+
+    def get_value
+      @value
+    end
+  end
+
+  class TestClass
+    extend Chef::Deprecation::Warnings
+    include DeprecatedMethods
+    add_deprecation_warnings_for(DeprecatedMethods.instance_methods)
+  end
+
+  method_snapshot_file = File.join(CHEF_SPEC_DATA, "file-providers-method-snapshot-chef-11-4.json")
+  method_snapshot = JSON.parse(File.open(method_snapshot_file).read())
+
+  method_snapshot.each do |class_name, old_methods|
+    class_object = class_from_string(class_name)
+    current_methods = class_object.public_instance_methods.map(&:to_sym)
+
+    it "defines all methods on #{class_object} that were available in 11.0" do
+      old_methods.each do |old_method|
+        current_methods.should include(old_method.to_sym)
+      end
+    end
+  end
+
+  context 'deprecation warning messages' do
+    before(:each) do
+      @warning_output = [ ]
+      Chef::Log.stub!(:warn) { |msg| @warning_output << msg }
+    end
+
+    it 'should be enabled for deprecated methods' do
+      TestClass.new.deprecated_method(10)
+      @warning_output.should_not be_empty
+    end
+
+    it 'should contain stack trace' do
+      TestClass.new.deprecated_method(10)
+      @warning_output.join("").include?(".rb").should be_true
+    end
+  end
+
+  it 'deprecated methods should still be called' do
+    test_instance = TestClass.new
+    test_instance.deprecated_method(10)
+    test_instance.get_value.should == 10
+  end
+
+end
+