chef 10.34.6 → 11.0.0.beta.0

data/spec/spec_helper.rb

@@ -19,7 +19,7 @@
 # Add it to one of the files in spec/support
 
 # 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
@@ -38,10 +38,11 @@ require 'chef'
 require 'chef/knife'
 Chef::Knife.load_commands
 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,13 +52,6 @@ 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.
@@ -76,34 +70,16 @@ 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 :windows64_only => true unless windows64?
+  config.filter_run_excluding :windows32_only => true unless windows32?
   config.filter_run_excluding :unix_only => true unless unix?
   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 :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?
 
-  # 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|
-    type, target_provider = criteria.first
-
-    platform = TEST_PLATFORM.dup
-    platform_version = TEST_PLATFORM_VERSION.dup
-
-    begin
-      provider_for_running_platform = Chef::Platform.find_provider(platform, platform_version, type)
-      provider_for_running_platform != target_provider
-    rescue ArgumentError # no provider for platform
-      true
-    end
-  }
-
   config.run_all_when_everything_filtered = true
   config.treat_symbols_as_metadata_keys_with_true_values = true
 end

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
 

data/spec/support/platform_helpers.rb

@@ -1,7 +1,3 @@
-require 'chef/mixin/shell_out'
-
-include Chef::Mixin::ShellOut
-
 def ruby_19?
   !!(RUBY_VERSION =~ /^1.9/)
 end
@@ -22,17 +18,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?

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

@@ -17,42 +17,104 @@
 #
 
 shared_examples_for "a directory resource" do
+
+  let(:expect_updated?) {true}
+
   context "when the target directory does not exist" do
-    it "creates the directory when the :create action is run" do
-      resource.run_action(:create)
-      File.should exist(path)
+    before do
+      # assert pre-condition
+      File.should_not exist(path)
     end
 
-    it "recursively creates required directories if requested" do
-      resource.recursive(true)
-      recursive_path = File.join(path, 'red-headed-stepchild')
-      resource.path(recursive_path)
-      resource.run_action(:create)
-      File.should exist(path)
-      File.should exist(recursive_path)
+    describe "when running action :create" do
+      context "and the recursive option is not set" do
+        before do
+          resource.run_action(:create)
+        end
+
+        it "creates the directory when the :create action is run" do
+          File.should exist(path)
+        end
+
+        it "is marked updated by last action" do
+          resource.should be_updated_by_last_action
+        end
+      end
+
+      context "and the recursive option is set" do
+        before do
+          File.should_not exist(path)
+
+          resource.recursive(true)
+          @recursive_path = File.join(path, 'red-headed-stepchild')
+          resource.path(@recursive_path)
+          resource.run_action(:create)
+        end
+
+        it "recursively creates required directories" do
+          File.should exist(path)
+          File.should exist(@recursive_path)
+        end
+
+        it "is marked updated by last action" do
+          resource.should be_updated_by_last_action
+        end
+      end
     end
   end
 
   context "when the target directory exists" do
     before(:each) do
-      FileUtils.mkdir(path)
-    end
+      # For resources such as remote_directory, simply creating the base
+      # directory isn't enough to test that the system is in the desired state,
+      # so we run the resource twice--otherwise the updated_by_last_action test
+      # will fail.
+      resource.dup.run_action(:create)
+      File.should exist(path)
 
-    it "does not re-create the directory" do
       resource.run_action(:create)
-      File.should exist(path)
     end
 
-    it "deletes the directory when the :delete action is run" do
-      resource.run_action(:delete)
-      File.should_not exist(path)
+    describe "when running action :create" do
+      before do
+        resource.run_action(:create)
+      end
+
+      it "does not re-create the directory" do
+        File.should exist(path)
+      end
+
+      it "is not marked updated by last action" do
+        resource.should_not be_updated_by_last_action
+      end
     end
 
-    it "recursively deletes directories if requested" do
-      FileUtils.mkdir(File.join(path, 'red-headed-stepchild'))
-      resource.recursive(true)
-      resource.run_action(:delete)
-      File.should_not exist(path)
+    describe "when running action :delete" do
+      context "without the recursive option" do
+        before do
+          resource.run_action(:delete)
+        end
+
+        it "deletes the directory" do
+          File.should_not exist(path)
+        end
+
+        it "is marked as updated by last action" do
+          resource.should be_updated_by_last_action
+        end
+      end
+
+      context "with the recursive option" do
+        before do
+          FileUtils.mkdir(File.join(path, 'red-headed-stepchild'))
+          resource.recursive(true)
+          resource.run_action(:delete)
+        end
+
+        it "recursively deletes directories" do
+          File.should_not exist(path)
+        end
+      end
     end
   end
 

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

@@ -17,67 +17,145 @@
 #
 
 shared_examples_for "a file with the wrong content" do
-  it "overwrites the file with the updated content when the :create action is run" do
-    Chef::Config[:file_backup_path] = CHEF_SPEC_BACKUP_PATH
-    sleep 1
-    resource.run_action(:create)
-    File.stat(path).mtime.should > @expected_mtime
-    sha256_checksum(path).should_not == @expected_checksum
-  end
-
-  it "doesn't overwrite the file when the :create_if_missing action is run" do
-    sleep 1
-    resource.run_action(:create_if_missing)
-    File.stat(path).mtime.should == @expected_mtime
+  before do
+    # Assert starting state is as expected
+    File.should exist(path)
+    # Kinda weird, in this case @expected_checksum is the cksum of the file
+    # with incorrect content.
     sha256_checksum(path).should == @expected_checksum
   end
 
-  it "should backup the existing file" do
-    Chef::Config[:file_backup_path] = CHEF_SPEC_BACKUP_PATH
-    resource.run_action(:create)
-    Dir.glob(backup_glob).size.should equal(1)
+  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
+
+      it "overwrites the file with the updated content when the :create action is run" do
+        File.stat(path).mtime.should > @expected_mtime
+        sha256_checksum(path).should_not == @expected_checksum
+      end
+
+      it "backs up the existing file" do
+        Dir.glob(backup_glob).size.should equal(1)
+      end
+
+      it "is marked as updated by last action" do
+        resource.should be_updated_by_last_action
+      end
+    end
+
+    context "with backups disabled" do
+      before do
+        Chef::Config[:file_backup_path] = CHEF_SPEC_BACKUP_PATH
+        resource.backup(0)
+        resource.run_action(:create)
+      end
+
+      it "should not attempt to backup the existing file if :backup == 0" do
+        Dir.glob(backup_glob).size.should equal(0)
+      end
+    end
   end
 
-  it "should not attempt to backup the existing file if :backup == 0" do
-    Chef::Config[:file_backup_path] = CHEF_SPEC_BACKUP_PATH
-    resource.backup(0)
-    resource.run_action(:create)
-    Dir.glob(backup_glob).size.should equal(0)
+  describe "when running action :create_if_missing" do
+    before do
+      resource.run_action(:create_if_missing)
+    end
+
+    it "doesn't overwrite the file when the :create_if_missing action is run" do
+      File.stat(path).mtime.should == @expected_mtime
+      sha256_checksum(path).should == @expected_checksum
+    end
+
+    it "is not marked as updated" do
+      resource.should_not be_updated_by_last_action
+    end
   end
 
-  it "deletes the file when the :delete action is run" do
-    resource.run_action(:delete)
-    File.should_not exist(path)
+  describe "when running action :delete" do
+    before do
+      resource.run_action(:delete)
+    end
+
+    it "deletes the file" do
+      File.should_not exist(path)
+    end
+
+    it "is marked as updated by last action" do
+      resource.should be_updated_by_last_action
+    end
   end
 end
 
 shared_examples_for "a file with the correct content" do
-  it "does not overwrite the original when the :create action is run" do
-    resource.run_action(:create)
+  before do
+    # Assert starting state is as expected
+    File.should exist(path)
     sha256_checksum(path).should == @expected_checksum
   end
 
-  it "does not update the mtime/atime of the file when the :create action is run" do
-    sleep 1
-    File.stat(path).mtime.should == @expected_mtime
-    File.stat(path).atime.should be_within(2).of(@expected_atime)
+  describe "when running action :create" do
+    before do
+      resource.run_action(:create)
+    end
+    it "does not overwrite the original when the :create action is run" do
+      sha256_checksum(path).should == @expected_checksum
+    end
+
+    it "does not update the mtime of the file when the :create action is run" do
+      File.stat(path).mtime.should == @expected_mtime
+    end
+
+    it "is not marked as updated by last action" do
+      resource.should_not be_updated_by_last_action
+    end
   end
 
-  it "doesn't overwrite the file when the :create_if_missing action is run" do
-    resource.run_action(:create_if_missing)
-    sha256_checksum(path).should == @expected_checksum
+  describe "when running action :create_if_missing" do
+    before do
+      resource.run_action(:create_if_missing)
+    end
+
+    it "doesn't overwrite the file when the :create_if_missing action is run" do
+      sha256_checksum(path).should == @expected_checksum
+    end
+
+    it "is not marked as updated by last action" do
+      resource.should_not be_updated_by_last_action
+    end
   end
 
-  it "deletes the file when the :delete action is run" do
-    resource.run_action(:delete)
-    File.should_not exist(path)
+  describe "when running action :delete" do
+    before do
+      resource.run_action(:delete)
+    end
+
+    it "deletes the file when the :delete action is run" do
+      File.should_not exist(path)
+    end
+
+    it "is marked as updated by last action" do
+      resource.should be_updated_by_last_action
+    end
   end
 end
 
 shared_examples_for "a file resource" do
+  before do
+    Chef::Log.level = :info
+  end
    # note the stripping of the drive letter from the tmpdir on windows
   let(:backup_glob) { File.join(CHEF_SPEC_BACKUP_PATH, Dir.tmpdir.sub(/^([A-Za-z]:)/, ""), "#{file_base}*") }
 
+  # Most tests update the resource, but a few do not. We need to test that the
+  # resource is marked updated or not correctly, but the test contexts are
+  # composed between correct/incorrect content and correct/incorrect
+  # permissions. We override this "let" definition in the context where content
+  # and permissions are correct.
+  let(:expect_updated?) { true }
+
   def binread(file)
     content = File.open(file, "rb") do |f|
       f.read
@@ -87,27 +165,55 @@ shared_examples_for "a file resource" do
   end
 
   context "when the target file does not exist" do
-
-    it_behaves_like "a securable resource"   
-    
-    it "creates the file when the :create action is run" do
-      resource.run_action(:create)
-      File.should exist(path)
+    before do
+      # Assert starting state is expected
+      File.should_not exist(path)
     end
 
-    it "creates the file with the correct content when the :create action is run" do
-      resource.run_action(:create)
-      binread(path).should == expected_content
+    describe "when running action :create" do
+      before do
+        resource.run_action(:create)
+      end
+
+      it "creates the file when the :create action is run" do
+        File.should exist(path)
+      end
+
+      it "creates the file with the correct content when the :create action is run" do
+        binread(path).should == expected_content
+      end
+
+      it "is marked as updated by last action" do
+        resource.should be_updated_by_last_action
+      end
     end
 
-    it "creates the file with the correct content when the :create_if_missing action is run" do
-      resource.run_action(:create_if_missing)
-      binread(path).should == expected_content
+    describe "when running action :create_if_missing" do
+      before do
+        resource.run_action(:create_if_missing)
+      end
+
+      it "creates the file with the correct content" do
+        binread(path).should == expected_content
+      end
+
+      it "is marked as updated by last action" do
+        resource.should be_updated_by_last_action
+      end
     end
 
-    it "deletes the file when the :delete action is run" do
-      resource.run_action(:delete)
-      File.should_not exist(path)
+    describe "when running action :delete" do
+      before do
+        resource.run_action(:delete)
+      end
+
+      it "deletes the file when the :delete action is run" do
+        File.should_not exist(path)
+      end
+
+      it "is not marked updated by last action" do
+        resource.should_not be_updated_by_last_action
+      end
     end
   end
 
@@ -124,6 +230,9 @@ shared_examples_for "a file resource" do
   context "when the target file has the wrong content" do
     before(:each) do
       File.open(path, "wb") { |f| f.print "This is so wrong!!!" }
+      now = Time.now.to_i
+      File.utime(now - 9000, now - 9000, path)
+
       @expected_mtime = File.stat(path).mtime
       @expected_checksum = sha256_checksum(path)
     end
@@ -140,7 +249,7 @@ shared_examples_for "a file resource" do
       include_context "setup broken permissions"
 
       it_behaves_like "a file with the wrong content"
-  
+
       it_behaves_like "a securable resource"
     end
   end
@@ -148,12 +257,19 @@ shared_examples_for "a file resource" do
   context "when the target file has the correct content" do
     before(:each) do
       File.open(path, "wb") { |f| f.print expected_content }
+      now = Time.now.to_i
+      File.utime(now - 9000, now - 9000, path)
+
       @expected_mtime = File.stat(path).mtime
-      @expected_atime = File.stat(path).atime
       @expected_checksum = sha256_checksum(path)
     end
 
     describe "and the target file has the correct permissions" do
+
+      # When permissions and content are correct, chef should do nothing and
+      # the resource should not be marked updated.
+      let(:expect_updated?) { false }
+
       include_context "setup correct permissions"
 
       it_behaves_like "a file with the correct content"
@@ -170,24 +286,6 @@ shared_examples_for "a file resource" do
     end
   end
 
-  it_behaves_like "a file that inherits permissions from a parent directory"
-  
-end
-
-shared_examples_for "a file that inherits permissions from a parent directory" do
-  include_context "use Windows permissions" 
-  context "on Windows", :windows_only do
-    it "has only inherited aces if no explicit aces were specified" do
-      File.exist?(path).should == false
-
-      resource.run_action(:create)
-
-      descriptor.dacl_inherits?.should == true
-      descriptor.dacl.each do | ace |
-        ace.inherited?.should == true
-      end
-    end
-  end
 end
 
 shared_context Chef::Resource::File  do