chef 11.6.2-x86-mingw32 → 11.8.0.rc.1-x86-mingw32

data/spec/spec_helper.rb

@@ -67,6 +67,8 @@ require 'chef/applications'
 require 'chef/shell'
 require 'chef/util/file_edit'
 
+require 'chef/config'
+
 # If you want to load anything into the testing environment
 # without versioning it, add it to spec/support/local_gems.rb
 require 'spec/support/local_gems.rb' if File.exists?(File.join(File.dirname(__FILE__), 'support', 'local_gems.rb'))
@@ -107,6 +109,8 @@ RSpec.configure do |config|
   config.filter_run_excluding :windows32_only => true unless windows32?
   config.filter_run_excluding :system_windows_service_gem_only => true unless system_windows_service_gem?
   config.filter_run_excluding :unix_only => true unless unix?
+  # Remove this filter once these issues are fixed: OC-9764, OC-9765, OC-9766, OC-9767
+  config.filter_run_excluding :unsupported_group_provider_platform => true if (os_x? or solaris? or freebsd? or suse?)
   config.filter_run_excluding :supports_cloexec => true unless supports_cloexec?
   config.filter_run_excluding :selinux_only => true unless selinux_enabled?
   config.filter_run_excluding :ruby_18_only => true unless ruby_18?
@@ -114,7 +118,8 @@ RSpec.configure do |config|
   config.filter_run_excluding :ruby_gte_19_only => true unless ruby_gte_19?
   config.filter_run_excluding :ruby_20_only => true unless ruby_20?
   config.filter_run_excluding :ruby_gte_20_only => true unless ruby_gte_20?
-  config.filter_run_excluding :requires_root => true unless ENV['USER'] == 'root'
+  config.filter_run_excluding :requires_root => true unless ENV['USER'] == 'root' || ENV['LOGIN'] == 'root'
+  config.filter_run_excluding :requires_root_or_running_windows => true unless (ENV['USER'] == 'root' or windows?)
   config.filter_run_excluding :requires_unprivileged_user => true if ENV['USER'] == 'root'
   config.filter_run_excluding :uses_diff => true unless has_diff?
 
@@ -142,4 +147,33 @@ RSpec.configure do |config|
 
   config.run_all_when_everything_filtered = true
   config.treat_symbols_as_metadata_keys_with_true_values = true
+
+  config.before(:each) do
+    Chef::Config.reset
+  end
+end
+
+require 'webrick/utils'
+
+#    Webrick uses a centralized/synchronized timeout manager. It works by
+#    starting a thread to check for timeouts on an interval. The timeout
+#    checker thread cannot be stopped or canceled in any easy way, and it
+#    makes calls to Time.new, which fail when rspec is in the process of
+#    creating a method stub for that method. Since our tests don't rely on
+#    any timeout behavior enforced by webrick, disable the timeout manager
+#    via a monkey patch.
+#
+#    Hopefully this fails loudly if the webrick code should change. As of this
+#    writing, the relevant code is in webrick/utils, which can be located on
+#    your system with:
+#
+#    $ gem which webrick/utils
+module WEBrick
+  module Utils
+    class TimeoutHandler
+      def initialize
+        @timeout_info = Hash.new
+      end
+    end
+  end
 end

data/spec/support/lib/chef/provider/easy.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.
@@ -22,11 +22,11 @@ class Chef
       def load_current_resource
         true
       end
-  
+
       def action_sell
         true
       end
-      
+
       def action_buy
         true
       end

data/spec/support/lib/chef/provider/snakeoil.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.
@@ -22,7 +22,7 @@ class Chef
       def load_current_resource
         true
       end
-  
+
       def action_purr
         @new_resource.updated_by_last_action(true)
         true
@@ -31,7 +31,7 @@ class Chef
       def action_sell
         true
       end
-      
+
       def action_buy
         true
       end

data/spec/support/lib/chef/resource/cat.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,15 +19,15 @@
 class Chef
   class Resource
     class Cat < Chef::Resource
-      
+
       attr_accessor :action
-      
+
       def initialize(name, run_context=nil)
         @resource_name = :cat
         super
         @action = "sell"
       end
-      
+
       def pretty_kitty(arg=nil)
         if arg == true or arg == false
           @pretty_kitty = arg

data/spec/support/lib/chef/resource/with_state.rb

@@ -0,0 +1,37 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2008, 2010 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 'chef/knife'
+require 'chef/json_compat'
+
+class Chef
+  class Resource
+    class WithState < Chef::Resource
+      attr_accessor :state
+
+      def initialize(name, run_context=nil)
+        @resource_name = :with_state
+        super
+      end
+
+      def state
+        @state
+      end
+    end
+  end
+end

data/spec/support/lib/library_load_order.rb

@@ -0,0 +1,22 @@
+# Helper module to track the load order of library files.
+# Used by `cookbook_compiler_spec.rb`
+#
+# This module must be loaded for any tests that load the cookbook
+# data/run_context/cookbooks/test to succeed.
+module LibraryLoadOrder
+  extend self
+
+  def load_order
+    @load_order ||= []
+  end
+
+  def reset!
+    @load_order = nil
+  end
+
+  def record(file)
+    load_order << file
+  end
+end
+
+

data/spec/support/platform_helpers.rb

@@ -60,6 +60,10 @@ def freebsd?
   !!(RUBY_PLATFORM =~ /freebsd/)
 end
 
+def aix?
+  !!(RUBY_PLATFORM =~ /aix/)
+end
+
 def supports_cloexec?
   Fcntl.const_defined?('F_SETFD') && Fcntl.const_defined?('FD_CLOEXEC')
 end
@@ -87,3 +91,7 @@ def selinux_enabled?
     return false
   end
 end
+
+def suse?
+  File.exists?("/etc/SuSE-release")
+end

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

@@ -18,45 +18,29 @@
 
 shared_context "deploying with move" do
   before do
-    @original_atomic_update = Chef::Config[:file_atomic_update]
+    Chef::Config[:file_backup_path] = CHEF_SPEC_BACKUP_PATH
     Chef::Config[:file_atomic_update] = true
   end
-
-  after do
-    Chef::Config[:file_atomic_update] = @original_atomic_update
-  end
 end
 
 shared_context "deploying with copy" do
   before do
-    @original_atomic_update = Chef::Config[:file_atomic_update]
+    Chef::Config[:file_backup_path] = CHEF_SPEC_BACKUP_PATH
     Chef::Config[:file_atomic_update] = false
   end
-
-  after do
-    Chef::Config[:file_atomic_update] = @original_atomic_update
-  end
 end
 
 shared_context "deploying via tmpdir" do
   before do
-    @original_stage_via = Chef::Config[:file_staging_uses_destdir]
     Chef::Config[:file_staging_uses_destdir] = false
-  end
-
-  after do
-    Chef::Config[:file_staging_uses_destdir] = @original_stage_via
+    Chef::Config[:file_backup_path] = CHEF_SPEC_BACKUP_PATH
   end
 end
 
 shared_context "deploying via destdir" do
   before do
-    @original_stage_via = Chef::Config[:file_staging_uses_destdir]
     Chef::Config[:file_staging_uses_destdir] = true
-  end
-
-  after do
-    Chef::Config[:file_staging_uses_destdir] = @original_stage_via
+    Chef::Config[:file_backup_path] = CHEF_SPEC_BACKUP_PATH
   end
 end
 
@@ -75,7 +59,6 @@ shared_examples_for "a file with the wrong content" do
   context "when running action :create" do
     context "with backups enabled" do
       before do
-        Chef::Config[:file_backup_path] = CHEF_SPEC_BACKUP_PATH
         resource.run_action(:create)
       end
 
@@ -99,7 +82,6 @@ shared_examples_for "a file with the wrong content" do
 
     context "with backups disabled" do
       before do
-        Chef::Config[:file_backup_path] = CHEF_SPEC_BACKUP_PATH
         resource.backup(0)
         resource.run_action(:create)
       end

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

@@ -0,0 +1,48 @@
+#
+# 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.
+#
+
+# Shared context used by both Powershell and Batch script provider
+# tests.
+
+shared_context Chef::Resource::WindowsScript do
+  before(:all) do
+
+    ohai_reader = Ohai::System.new
+    ohai_reader.require_plugin("os")
+    ohai_reader.require_plugin("windows::platform")
+
+    new_node = Chef::Node.new
+    new_node.consume_external_attrs(ohai_reader.data,{})
+
+    events = Chef::EventDispatch::Dispatcher.new
+
+    @run_context = Chef::RunContext.new(new_node, {}, events)
+  end
+
+  let(:script_output_path) do
+    File.join(Dir.tmpdir, make_tmpname("windows_script_test"))
+  end
+
+  before(:each) do
+k    File.delete(script_output_path) if File.exists?(script_output_path)
+  end
+
+  after(:each) do
+    File.delete(script_output_path) if File.exists?(script_output_path)
+  end
+end

data/spec/support/shared/integration/integration_helper.rb

@@ -28,30 +28,14 @@ require 'spec_helper'
 module IntegrationSupport
   include ChefZero::RSpec
 
-  def self.extended(base)
-    base.before :each do
-      # We mess with Chef::Config a lot.  Save and restore it.
-      @old_chef_config = Chef::Config.configuration
-      Chef::Config.configuration = Chef::Config.configuration.dup
-      Chef::Config.repo_mode = nil
-      Chef::Config.versioned_cookbooks = nil
-    end
-    base.after :each do
-      Chef::Config.configuration = @old_chef_config
-    end
-  end
-
   def when_the_repository(description, *args, &block)
     context "When the local repository #{description}", *args do
       before :each do
         raise "Can only create one directory per test" if @repository_dir
         @repository_dir = Dir.mktmpdir('chef_repo')
-        @old_chef_repo_path = Chef::Config.chef_repo_path
-        @old_paths = {}
         Chef::Config.chef_repo_path = @repository_dir
         %w(client cookbook data_bag environment node role user).each do |object_name|
-          @old_paths[object_name] = Chef::Config["#{object_name}_path".to_sym]
-          Chef::Config["#{object_name}_path".to_sym] = nil
+          Chef::Config.delete("#{object_name}_path".to_sym)
         end
       end
 
@@ -59,13 +43,11 @@ module IntegrationSupport
         if @repository_dir
           begin
             %w(client cookbook data_bag environment node role user).each do |object_name|
-              Chef::Config["#{object_name}_path".to_sym] = @old_paths[object_name]
+              Chef::Config.delete("#{object_name}_path".to_sym)
             end
-            Chef::Config.chef_repo_path = @old_chef_repo_path
+            Chef::Config.delete(:chef_repo_path)
             FileUtils.remove_entry_secure(@repository_dir)
           ensure
-            @old_chef_repo_path = nil
-            @old_paths = nil
             @repository_dir = nil
           end
         end
@@ -150,7 +132,7 @@ module IntegrationSupport
     _m = { :versioned_cookbooks => true }.merge(_metadata)
     context 'with versioned cookbooks', _m do
       before(:each) { Chef::Config[:versioned_cookbooks] = true }
-      after(:each)  { Chef::Config[:versioned_cookbooks] = false }
+      after(:each)  { Chef::Config.delete(:versioned_cookbooks) }
       instance_eval(&block)
     end
   end
@@ -160,6 +142,7 @@ module IntegrationSupport
     context 'with versioned cookbooks', _m do
       # Just make sure this goes back to default
       before(:each) { Chef::Config[:versioned_cookbooks] = false }
+      after(:each)  { Chef::Config.delete(:versioned_cookbooks) }
       instance_eval(&block)
     end
   end

data/spec/support/shared/integration/knife_support.rb

@@ -38,7 +38,6 @@ module KnifeSupport
 
     # Work on machines where we can't access /var
     checksums_cache_dir = Dir.mktmpdir('checksums') do |checksums_cache_dir|
-      old_cache_options = Chef::Config[:cache_options]
       Chef::Config[:cache_options] = {
         :path => checksums_cache_dir,
         :skip_expires => true
@@ -84,7 +83,7 @@ module KnifeSupport
         Chef::Log.level = ( DEBUG ? :debug : :warn )
         Chef::Log::Formatter.show_time = false
 
-        instance.run
+        instance.run_with_pretty_exceptions(true)
 
         exit_code = 0
 
@@ -94,7 +93,8 @@ module KnifeSupport
       ensure
         Chef::Log.use_log_devices(old_loggers)
         Chef::Log.level = old_log_level
-        Chef::Config[:cache_options] = old_cache_options
+        Chef::Config.delete(:cache_options)
+        Chef::Config.delete(:concurrency)
       end
 
       KnifeResult.new(stdout.string, stderr.string, exit_code)

data/spec/support/shared/unit/script_resource.rb

@@ -7,9 +7,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.
@@ -23,26 +23,26 @@ shared_examples_for "a script resource" do
 
   before(:each) do
     @resource = script_resource
-  end  
+  end
 
   it "should create a new Chef::Resource::Script" do
     @resource.should be_a_kind_of(Chef::Resource)
     @resource.should be_a_kind_of(Chef::Resource::Script)
   end
-  
+
   it "should have a resource name of :script" do
     @resource.resource_name.should eql(resource_name)
   end
-  
+
   it "should set command to the argument provided to new" do
     @resource.command.should eql(resource_instance_name)
   end
-  
+
   it "should accept a string for the code" do
     @resource.code "hey jude"
     @resource.code.should eql("hey jude")
   end
-  
+
   it "should accept a string for the flags" do
     @resource.flags "-f"
     @resource.flags.should eql("-f")