chef 10.34.6-x86-mingw32 → 11.6.2-x86-mingw32

data/spec/integration/solo/solo_spec.rb

@@ -0,0 +1,41 @@
+require 'support/shared/integration/integration_helper'
+require 'chef/mixin/shell_out'
+
+describe "chef-solo" do
+  extend IntegrationSupport
+  include Chef::Mixin::ShellOut
+
+  context "with a no-op recipe in the run_list" do
+
+    when_the_repository "has a cookbook with a no-op recipe" do
+      directory 'cookbooks'
+      directory 'cookbooks/x'
+      directory 'cookbooks/x/recipes'
+      file 'cookbooks/x/metadata.rb', 'version "1.0.0"'
+      file 'cookbooks/x/recipes/default.rb', ''
+
+      before do
+        @chef_file_cache = Dir.mktmpdir('file_cache')
+      end
+
+      after do
+        FileUtils.rm_rf(@chef_file_cache) if @chef_file_cache
+      end
+
+      it "should complete with success" do
+        # prepare the solo config
+        directory 'config'
+        file 'config/solo.rb', <<EOM
+cookbook_path "#{File.join(@repository_dir, 'cookbooks')}"
+file_cache_path "#{@chef_file_cache}"
+EOM
+        config_file = canonicalize_path(File.join(@repository_dir, 'config', 'solo.rb'))
+
+        chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..", "bin")
+        result = shell_out("chef-solo -c \"#{config_file}\" -o 'x::default' -l debug", :cwd => chef_dir)
+        result.error!
+      end
+
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -18,8 +18,14 @@
 # If you need to add anything in here, don't.
 # Add it to one of the files in spec/support
 
+# Configure this first so it doesn't trigger annoying warning when we use it.
+# Main rspec configuration comes later
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+end
+
 # Abuse ruby's constant lookup to avoid undefined constant errors
-module Shef
+module Shell
   JUST_TESTING_MOVE_ALONG = true unless defined? JUST_TESTING_MOVE_ALONG
   IRB = nil unless defined? IRB
 end
@@ -34,14 +40,31 @@ $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 $:.unshift(File.expand_path("../lib", __FILE__))
 $:.unshift(File.dirname(__FILE__))
 
+if ENV["COVERAGE"]
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter "/spec/"
+    add_group "Remote File", "remote_file"
+    add_group "Resources", "/resource/"
+    add_group "Providers", "/provider/"
+    add_group "Knife", "knife"
+  end
+end
+
 require 'chef'
 require 'chef/knife'
-Chef::Knife.load_commands
+
+Dir['lib/chef/knife/**/*.rb'].
+  map {|f| f.gsub('lib/', '') }.
+  map {|f| f.gsub(%r[\.rb$], '') }.
+  each {|f| require f }
+
 require 'chef/mixins'
+require 'chef/dsl'
 require 'chef/application'
 require 'chef/applications'
 
-require 'chef/shef'
+require 'chef/shell'
 require 'chef/util/file_edit'
 
 # If you want to load anything into the testing environment
@@ -51,21 +74,22 @@ require 'spec/support/local_gems.rb' if File.exists?(File.join(File.dirname(__FI
 # Explicitly require spec helpers that need to load first
 require 'spec/support/platform_helpers'
 
-
-OHAI_SYSTEM = Ohai::System.new
-OHAI_SYSTEM.require_plugin("os")
-OHAI_SYSTEM.require_plugin("platform")
-TEST_PLATFORM = OHAI_SYSTEM["platform"].dup.freeze
-TEST_PLATFORM_VERSION = OHAI_SYSTEM["platform_version"].dup.freeze
-
 # Autoloads support files
 # Excludes support/platforms by default
 # Do not change the gsub.
 Dir["spec/support/**/*.rb"].
   reject { |f| f =~ %r{^spec/support/platforms} }.
   map { |f| f.gsub(%r{.rb$}, '') }.
+  map { |f| f.gsub(%r[spec/], '')}.
   each { |f| require f }
 
+
+OHAI_SYSTEM = Ohai::System.new
+OHAI_SYSTEM.require_plugin("os")
+OHAI_SYSTEM.require_plugin("platform")
+TEST_PLATFORM = OHAI_SYSTEM["platform"].dup.freeze
+TEST_PLATFORM_VERSION = OHAI_SYSTEM["platform_version"].dup.freeze
+
 RSpec.configure do |config|
   config.include(Matchers)
   config.filter_run :focus => true
@@ -76,18 +100,30 @@ RSpec.configure do |config|
 
   # Add jruby filters here
   config.filter_run_excluding :windows_only => true unless windows?
-  config.filter_run_excluding :not_supported_on_mac_osx_106 => true if mac_osx_106?
-  config.filter_run_excluding :solaris_only => true unless solaris?
   config.filter_run_excluding :not_supported_on_win2k3 => true if windows_win2k3?
   config.filter_run_excluding :not_supported_on_solaris => true if solaris?
+  config.filter_run_excluding :win2k3_only => true unless windows_win2k3?
+  config.filter_run_excluding :windows64_only => true unless windows64?
+  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?
+  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?
   config.filter_run_excluding :ruby_19_only => true unless ruby_19?
+  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_or_running_windows => true unless (ENV['USER'] == 'root' || windows?)
   config.filter_run_excluding :requires_unprivileged_user => true if ENV['USER'] == 'root'
   config.filter_run_excluding :uses_diff => true unless has_diff?
 
+  running_platform_arch = `uname -m`.strip
+
+  config.filter_run_excluding :arch => lambda {|target_arch|
+    running_platform_arch != target_arch
+  }
+
   # Functional Resource tests that are provider-specific:
   # context "on platforms that use useradd", :provider => {:user => Chef::Provider::User::Useradd}} do #...
   config.filter_run_excluding :provider => lambda {|criteria|

data/spec/stress/win32/security_spec.rb

@@ -56,7 +56,7 @@ describe 'Chef::ReservedNames::Win32::Security', :windows_only do
   end
 
   it "should not leak when creating a new ACL and setting it on a file", :volatile do
-    securable_object = Chef::ReservedNames::Win32::Security::SecurableObject.new(@monkeyfoo)
+    securable_object = Security::SecurableObject.new(@monkeyfoo)
     lambda {
       securable_object.dacl = Chef::ReservedNames::Win32::Security::ACL.create([
         Chef::ReservedNames::Win32::Security::ACE.access_allowed(Chef::ReservedNames::Win32::Security::SID.Everyone, Chef::ReservedNames::Win32::API::Security::GENERIC_READ),

data/spec/support/chef_helpers.rb

@@ -17,8 +17,6 @@ CHEF_SPEC_DATA = File.expand_path(File.dirname(__FILE__) + "/../data/")
 CHEF_SPEC_BACKUP_PATH = File.join(Dir.tmpdir, 'test-backup-path')
 
 Chef::Config[:log_level] = :fatal
-Chef::Config[:cache_type] = "Memory"
-Chef::Config[:cache_options] = { }
 Chef::Config[:persistent_queue] = false
 Chef::Config[:file_backup_path] = CHEF_SPEC_BACKUP_PATH
 
@@ -34,7 +32,7 @@ end
 # From Ruby 1.9.2+
 # Here for backwards compatibility with Ruby 1.8.7
 # http://rubydoc.info/stdlib/tmpdir/1.9.2/Dir/Tmpname
-def make_tmpname(prefix_suffix, n)
+def make_tmpname(prefix_suffix, n = nil)
   case prefix_suffix
   when String
     prefix = prefix_suffix
@@ -63,3 +61,35 @@ def has_diff?
     false
   end
 end
+
+# This is a helper to determine if the ruby in the PATH contains
+# win32/service gem. windows_service_manager tests create a windows
+# service that starts with the system ruby and requires this gem.
+def system_windows_service_gem?
+  windows_service_gem_check_command = "ruby -e 'require \"win32/daemon\"' > /dev/null 2>&1"
+  if defined?(Bundler)
+    Bundler.with_clean_env do
+      # This returns true if the gem can be loaded
+      system windows_service_gem_check_command
+    end
+  else
+    # This returns true if the gem can be loaded
+    system windows_service_gem_check_command
+  end
+end
+
+# This is a helper to canonicalize paths that we're using in the file
+# tests.
+def canonicalize_path(path)
+  windows? ? path.gsub('/', '\\') : path
+end
+
+# Check if a cmd exists on the PATH
+def which(cmd)
+  paths = ENV['PATH'].split(File::PATH_SEPARATOR) + [ '/bin', '/usr/bin', '/sbin', '/usr/sbin' ]
+  paths.each do |path|
+    filename = File.join(path, cmd)
+    return filename if File.executable?(filename)
+  end
+  false
+end

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

@@ -29,12 +29,10 @@ class Chef
       end
       
       def pretty_kitty(arg=nil)
-        set_if_args(@pretty_kitty, arg) do
-          case arg
-          when true, false
-            @pretty_kitty = arg
-          end
+        if arg == true or arg == false
+          @pretty_kitty = arg
         end
+        @pretty_kitty
       end
     end
   end

data/spec/support/lib/chef/resource/one_two_three_four.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.
@@ -20,23 +20,21 @@ class Chef
   class Resource
     class OneTwoThreeFour < Chef::Resource
       attr_reader :i_can_count
-      
+
       def initialize(name, run_context)
         @resource_name = :one_two_three_four
         super
       end
-      
+
       def i_can_count(tf)
         @i_can_count = tf
       end
-      
+
       def something(arg=nil)
-        set_if_args(@something, arg) do
-          case arg
-          when true, false
-            @something = arg
-          end
+        if arg == true or arg == false
+          @something = arg
         end
+        @something
       end
     end
   end

data/spec/support/lib/chef/resource/zen_master.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.
@@ -23,23 +23,21 @@ class Chef
   class Resource
     class ZenMaster < Chef::Resource
       attr_reader :peace
-      
+
       def initialize(name, run_context=nil)
         @resource_name = :zen_master
         super
       end
-      
+
       def peace(tf)
         @peace = tf
       end
-      
+
       def something(arg=nil)
-        set_if_args(@something, arg) do
-          case arg
-          when true, false
-            @something = arg
-          end
+        if arg == true or arg == false
+          @something = arg
         end
+        @something
       end
     end
   end

data/spec/support/platform_helpers.rb

@@ -1,6 +1,16 @@
-require 'chef/mixin/shell_out'
+require 'fcntl'
 
-include Chef::Mixin::ShellOut
+def ruby_gte_20?
+  RUBY_VERSION.to_f >= 2.0
+end
+
+def ruby_gte_19?
+  RUBY_VERSION.to_f >= 1.9
+end
+
+def ruby_20?
+  !!(RUBY_VERSION =~ /^2.0/)
+end
 
 def ruby_19?
   !!(RUBY_VERSION =~ /^1.9/)
@@ -22,17 +32,14 @@ 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
+# 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' )
+end
+
+# detects if the hardware is 32-bit
+def windows32?
+  windows? && !windows64?
 end
 
 # def jruby?
@@ -53,4 +60,30 @@ def freebsd?
   !!(RUBY_PLATFORM =~ /freebsd/)
 end
 
+def supports_cloexec?
+  Fcntl.const_defined?('F_SETFD') && Fcntl.const_defined?('FD_CLOEXEC')
+end
+
 DEV_NULL = windows? ? 'NUL' : '/dev/null'
+
+def selinux_enabled?
+  # This code is currently copied from lib/chef/util/selinux to make
+  # specs independent of product.
+  selinuxenabled_path = which("selinuxenabled")
+  if selinuxenabled_path
+    cmd = Mixlib::ShellOut.new(selinuxenabled_path, :returns => [0,1])
+    cmd_result = cmd.run_command
+    case cmd_result.exitstatus
+    when 1
+      return false
+    when 0
+      return true
+    else
+      raise RuntimeError, "Unknown exit code from command #{selinuxenabled_path}: #{cmd.exitstatus}"
+    end
+  else
+    # We assume selinux is not enabled if selinux utils are not
+    # installed.
+    return false
+  end
+end

data/spec/support/platforms/win32/spec_service.rb

@@ -0,0 +1,59 @@
+#
+# Author:: Serdar Sutay (<serdar@lambda.local>)
+# 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 'win32/daemon'
+
+class SpecService < ::Win32::Daemon
+  def service_init
+    @test_service_file = "#{ENV['TMP']}/spec_service_file"
+  end
+
+  def service_main(*startup_parameters)
+    while running? do
+      if !File.exists?(@test_service_file)
+        File.open(@test_service_file, 'wb') do |f|
+          f.write("This file is created by SpecService")
+        end
+      end
+
+      sleep 1
+    end
+  end
+
+  ################################################################################
+  # Control Signal Callback Methods
+  ################################################################################
+
+  def service_stop
+  end
+
+  def service_pause
+  end
+
+  def service_resume
+  end
+
+  def service_shutdown
+  end
+end
+
+# To run this file as a service, it must be called as a script from within
+# the Windows Service framework.  In that case, kick off the main loop!
+if __FILE__ == $0
+  SpecService.mainloop
+end