chef 11.10.0.alpha.1-x86-mingw32 → 11.10.0.rc.0-x86-mingw32

data/spec/functional/resource/package_spec.rb

@@ -273,6 +273,23 @@ describe Chef::Resource::Package, metadata do
             package_resource.should be_updated_by_last_action
           end
 
+          context "with variables" do
+            let(:package_resource) do
+              r = base_resource
+              r.cookbook_name = "preseed"
+              r.response_file("preseed-template-variables.seed")
+              r.response_file_variables({ :template_variable => 'SUPPORTS VARIABLES' })
+              r
+            end
+
+            it "preseeds the package, then installs it" do
+              package_resource.run_action(:install)
+              cmd = shell_out!("debconf-show chef-integration-test")
+              cmd.stdout.should include('chef-integration-test/sample-var: "SUPPORTS VARIABLES"')
+              package_resource.should be_updated_by_last_action
+            end
+          end
+
         end
       end # installing w/ preseed
     end # when package not installed

data/spec/functional/resource/user_spec.rb

@@ -196,7 +196,7 @@ describe Chef::Resource::User, metadata do
           pw_entry.home.should == "/home/#{username}"
         end
 
-        if OHAI_SYSTEM["platform_family"] == "rhel"
+        if %w{rhel fedora}.include?(OHAI_SYSTEM["platform_family"])
           # Inconsistent behavior. See: CHEF-2205
           it "creates the home dir when not explicitly asked to on RHEL (XXX)" do
             File.should exist("/home/#{username}")
@@ -340,7 +340,7 @@ describe Chef::Resource::User, metadata do
           let(:existing_manage_home) { false }
           let(:manage_home) { true }
 
-          if OHAI_SYSTEM["platform_family"] == "rhel"
+          if %w{rhel fedora}.include?(OHAI_SYSTEM["platform_family"])
             # Inconsistent behavior. See: CHEF-2205
             it "created the home dir b/c of CHEF-2205 so it still exists" do
               # This behavior seems contrary to expectation and non-convergent.

data/spec/functional/win32/versions_spec.rb

@@ -50,6 +50,45 @@ describe "Chef::ReservedNames::Win32::Version", :windows_only do
     @version = Chef::ReservedNames::Win32::Version.new
   end
 
+  def for_each_windows_version(&block)
+    @version.methods.each do |method_name|
+      if Chef::ReservedNames::Win32::Version::WIN_VERSIONS.keys.find { | key | method_name.to_s == Chef::ReservedNames::Win32::Version.send(:method_name_from_marketing_name,key) }
+        yield method_name
+      end
+    end
+  end
+  
+  context "Win32 version object" do
+    it "should have have one method for each marketing version" do
+      versions = 0
+      for_each_windows_version { versions += 1 }
+      versions.should > 0
+      versions.should == Chef::ReservedNames::Win32::Version::WIN_VERSIONS.length
+    end
+
+    it "should only contain version methods with legal method names" do
+      method_name_pattern = /[a-z]+([a-z]|[0-9]|_)*\?{0,1}/
+
+      for_each_windows_version do |method_name|
+        method_match = method_name_pattern.match(method_name.to_s)
+        method_match.should_not be_nil
+        method_name.to_s.should == method_match[0]
+      end
+    end
+
+    it "should have exactly one method that returns true" do
+      true_versions = 0
+      for_each_windows_version do |method_name|
+        true_versions += 1 if @version.send(method_name)
+      end
+      true_versions.should == 1
+    end
+
+    it "should successfully execute all version methods" do
+      for_each_windows_version { |method_name| @version.send(method_name.to_sym) }
+    end
+  end
+  
   context "Windows Operating System version" do
     it "should match the version from WMI" do
       @current_os_version.should include(@version.marketing_name)

data/spec/integration/client/client_spec.rb

@@ -5,6 +5,19 @@ describe "chef-client" do
   extend IntegrationSupport
   include Chef::Mixin::ShellOut
 
+  let(:chef_dir) { File.join(File.dirname(__FILE__), "..", "..", "..", "bin") }
+
+  # Invoke `chef-client` as `ruby PATH/TO/chef-client`. This ensures the
+  # following constraints are satisfied:
+  # * Windows: windows can only run batch scripts as bare executables. Rubygems
+  # creates batch wrappers for installed gems, but we don't have batch wrappers
+  # in the source tree.
+  # * Other `chef-client` in PATH: A common case is running the tests on a
+  # machine that has omnibus chef installed. In that case we need to ensure
+  # we're running `chef-client` from the source tree and not the external one.
+  # cf. CHEF-4914
+  let(:chef_client) { "ruby #{chef_dir}/chef-client" }
+
   when_the_repository "has a cookbook with a no-op recipe" do
     file 'cookbooks/x/recipes/default.rb', ''
 
@@ -14,27 +27,23 @@ local_mode true
 cookbook_path "#{path_to('cookbooks')}"
 EOM
 
-      chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..", "bin")
-      result = shell_out("chef-client -c \"#{path_to('config/client.rb')}\" -o 'x::default'", :cwd => chef_dir)
+      result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" -o 'x::default'", :cwd => chef_dir)
       result.error!
     end
 
     context 'and no config file' do
       it 'should complete with success when cwd is just above cookbooks and paths are not specified' do
-        chef_dir = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "bin"))
-        result = shell_out("ruby #{chef_dir}/chef-client -z -o 'x::default' --config-file-jail \"#{path_to('')}\"", :cwd => path_to(''))
+        result = shell_out("#{chef_client} -z -o 'x::default' --config-file-jail \"#{path_to('')}\"", :cwd => path_to(''))
         result.error!
       end
 
       it 'should complete with success when cwd is below cookbooks and paths are not specified' do
-        chef_dir = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "bin"))
-        result = shell_out("ruby #{chef_dir}/chef-client -z -o 'x::default' --config-file-jail \"#{path_to('')}\"", :cwd => path_to('cookbooks/x'))
+        result = shell_out("#{chef_client} -z -o 'x::default' --config-file-jail \"#{path_to('')}\"", :cwd => path_to('cookbooks/x'))
         result.error!
       end
 
       it 'should fail when cwd is below high above and paths are not specified' do
-        chef_dir = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "bin"))
-        result = shell_out("ruby #{chef_dir}/chef-client -z -o 'x::default' --config-file-jail \"#{path_to('')}\"", :cwd => File.expand_path('..', path_to('')))
+        result = shell_out("#{chef_client} -z -o 'x::default' --config-file-jail \"#{path_to('')}\"", :cwd => File.expand_path('..', path_to('')))
         result.exitstatus.should == 1
       end
     end
@@ -43,15 +52,13 @@ EOM
       file '.chef/knife.rb', 'xxx.xxx'
 
       it 'should load .chef/knife.rb when -z is specified' do
-        chef_dir = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "bin"))
-        result = shell_out("ruby #{chef_dir}/chef-client -z -o 'x::default' --config-file-jail \"#{path_to('')}\"", :cwd => path_to(''))
+        result = shell_out("#{chef_client} -z -o 'x::default' --config-file-jail \"#{path_to('')}\"", :cwd => path_to(''))
         # FATAL: Configuration error NoMethodError: undefined method `xxx' for nil:NilClass
         result.stdout.should include("xxx")
       end
 
       it 'fails to load .chef/knife.rb when -z is specified and --config-file-jail does not include the .chef/knife.rb' do
-        chef_dir = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "bin"))
-        result = shell_out("ruby #{chef_dir}/chef-client -z -o 'x::default' --config-file-jail \"#{path_to('roles')}\"", :cwd => path_to(''))
+        result = shell_out("#{chef_client} -z -o 'x::default' --config-file-jail \"#{path_to('roles')}\"", :cwd => path_to(''))
         result.error!
       end
     end
@@ -62,8 +69,7 @@ local_mode true
 cookbook_path "#{path_to('cookbooks')}"
 EOM
 
-      chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..", "bin")
-      result = shell_out("chef-client -c \"#{path_to('config/client.rb')}\" -o 'x::default'", :cwd => chef_dir)
+      result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" -o 'x::default'", :cwd => chef_dir)
       result.error!
     end
 
@@ -105,8 +111,7 @@ client_key #{path_to('mykey.pem').inspect}
 cookbook_path #{path_to('cookbooks').inspect}
 EOM
 
-        chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..", "bin")
-        result = shell_out("chef-client -c \"#{path_to('config/client.rb')}\" -o 'x::default'", :cwd => chef_dir)
+        result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" -o 'x::default'", :cwd => chef_dir)
         result.error!
       end
 
@@ -129,8 +134,7 @@ file #{path_to('tempfile2.txt').inspect} do
 end
 EOM
 
-        chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..", "bin")
-        result = shell_out("chef-client -c \"#{path_to('config/client.rb')}\" #{path_to('arbitrary.rb')} #{path_to('arbitrary2.rb')}", :cwd => chef_dir)
+        result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" #{path_to('arbitrary.rb')} #{path_to('arbitrary2.rb')}", :cwd => chef_dir)
         result.error!
 
         IO.read(path_to('tempfile.txt')).should == '1'
@@ -150,8 +154,7 @@ file #{path_to('tempfile.txt').inspect} do
 end
 EOM
 
-        chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..", "bin")
-        result = shell_out("#{chef_dir}/chef-client -c \"#{path_to('config/client.rb')}\" arbitrary.rb", :cwd => path_to(''))
+        result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" arbitrary.rb", :cwd => path_to(''))
         result.error!
 
         IO.read(path_to('tempfile.txt')).should == '1'
@@ -175,8 +178,7 @@ file #{path_to('tempfile.txt').inspect} do
 end
 EOM
 
-        chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..", "bin")
-        result = shell_out("#{chef_dir}/chef-client -c \"#{path_to('config/client.rb')}\" -o x::constant_definition arbitrary.rb", :cwd => path_to(''))
+        result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" -o x::constant_definition arbitrary.rb", :cwd => path_to(''))
         result.error!
 
         IO.read(path_to('tempfile.txt')).should == '1'
@@ -190,8 +192,7 @@ chef_server_url 'http://omg.com/blah'
 cookbook_path "#{path_to('cookbooks')}"
 EOM
 
-      chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..", "bin")
-      result = shell_out("chef-client -c \"#{path_to('config/client.rb')}\" -o 'x::default' -z", :cwd => chef_dir)
+      result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" -o 'x::default' -z", :cwd => chef_dir)
       result.error!
     end
 
@@ -201,8 +202,7 @@ chef_server_url 'http://omg.com/blah'
 cookbook_path "#{path_to('cookbooks')}"
 EOM
 
-      chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..", "bin")
-      result = shell_out("chef-client -c \"#{path_to('config/client.rb')}\" -o 'x::default' --local-mode", :cwd => chef_dir)
+      result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" -o 'x::default' --local-mode", :cwd => chef_dir)
       result.error!
     end
 
@@ -212,8 +212,7 @@ chef_server_url 'http://omg.com/blah'
 cookbook_path "#{path_to('cookbooks')}"
 EOM
 
-      chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..", "bin")
-      result = shell_out("chef-client -c \"#{path_to('config/client.rb')}\" -o 'x::default' -z", :cwd => chef_dir)
+      result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" -o 'x::default' -z", :cwd => chef_dir)
       result.error!
     end
   end

data/spec/spec_helper.rb

@@ -33,6 +33,7 @@ end
 # Ruby 1.9 Compat
 $:.unshift File.expand_path("../..", __FILE__)
 
+
 require 'rubygems'
 require 'rspec/mocks'
 
@@ -108,6 +109,7 @@ RSpec.configure do |config|
   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 :windows_domain_joined_only => true unless windows_domain_joined?
   config.filter_run_excluding :solaris_only => true unless solaris?
   config.filter_run_excluding :system_windows_service_gem_only => true unless system_windows_service_gem?
   config.filter_run_excluding :unix_only => true unless unix?

data/spec/support/platform_helpers.rb

@@ -27,9 +27,15 @@ def windows?
   !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
 end
 
+require 'ruby-wmi' if windows?
+
+def windows_domain_joined?
+  return false unless windows?
+  WMI::Win32_ComputerSystem.find(:first).PartOfDomain
+end
+
 def windows_win2k3?
   return false unless windows?
-  require 'ruby-wmi'
 
   host = WMI::Win32_OperatingSystem.find(:first)
   (host.version && host.version.start_with?("5.2"))

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

@@ -16,6 +16,8 @@
 # limitations under the License.
 #
 
+require 'pry'
+
 shared_context "deploying with move" do
   before do
     Chef::Config[:file_backup_path] = CHEF_SPEC_BACKUP_PATH
@@ -54,25 +56,62 @@ shared_examples_for "a file with the wrong content" do
     sha256_checksum(path).should == @expected_checksum
   end
 
-  include_context "diff disabled"
+  describe "when diff is disabled" do
 
-  context "when running action :create" do
-    context "with backups enabled" do
-      before do
-        resource.run_action(:create)
+    include_context "diff disabled"
+
+    context "when running action :create" do
+      context "with backups enabled" do
+        before do
+          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
+
+        it "should restore the security contexts on selinux", :selinux_only do
+          selinux_security_context_restored?(path).should be_true
+        end
       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
+      context "with backups disabled" do
+        before do
+          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
+
+        it "should restore the security contexts on selinux", :selinux_only do
+          selinux_security_context_restored?(path).should be_true
+        end
       end
+    end
 
-      it "backs up the existing file" do
-        Dir.glob(backup_glob).size.should equal(1)
+    describe "when running action :create_if_missing" do
+      before do
+        resource.run_action(:create_if_missing)
       end
 
-      it "is marked as updated by last action" do
-        resource.should be_updated_by_last_action
+      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
 
       it "should restore the security contexts on selinux", :selinux_only do
@@ -80,52 +119,53 @@ shared_examples_for "a file with the wrong content" do
       end
     end
 
-    context "with backups disabled" do
+    describe "when running action :delete" do
       before do
-        resource.backup(0)
-        resource.run_action(:create)
+        resource.run_action(:delete)
       end
 
-      it "should not attempt to backup the existing file if :backup == 0" do
-        Dir.glob(backup_glob).size.should equal(0)
+      it "deletes the file" do
+        File.should_not exist(path)
       end
 
-      it "should restore the security contexts on selinux", :selinux_only do
-        selinux_security_context_restored?(path).should be_true
+      it "is marked as updated by last action" do
+        resource.should be_updated_by_last_action
       end
     end
+
   end
 
-  describe "when running action :create_if_missing" do
-    before do
-      resource.run_action(:create_if_missing)
-    end
+  context "when diff is enabled" do
+    describe 'sensitive attribute' do
+      context "should be insensitive by default" do
+        it { expect(resource.sensitive).to(be_false) }
+      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
+      context "when set" do
+        before { resource.sensitive(true) }
 
-    it "is not marked as updated" do
-      resource.should_not be_updated_by_last_action
-    end
+        it "should be set on the resource" do
+          expect(resource.sensitive).to(be_true)
+        end
 
-    it "should restore the security contexts on selinux", :selinux_only do
-      selinux_security_context_restored?(path).should be_true
-    end
-  end
+        context "when running :create action" do
+          let(:provider) { resource.provider_for_action(:create) }
+          let(:reporter_messages) { provider.instance_variable_get("@converge_actions").actions[0][0] }
 
-  describe "when running action :delete" do
-    before do
-      resource.run_action(:delete)
-    end
+          before do
+            provider.run_action
+          end
 
-    it "deletes the file" do
-      File.should_not exist(path)
-    end
+          it "should suppress the diff" do
+            expect(resource.diff).to(include('suppressed sensitive resource'))
+            expect(reporter_messages[1]).to eq("suppressed sensitive resource")
+          end
 
-    it "is marked as updated by last action" do
-      resource.should be_updated_by_last_action
+          it "should still include the updated checksums" do
+            expect(reporter_messages[0]).to include("update content in file")
+          end
+        end
+      end
     end
   end
 end

data/spec/unit/application_spec.rb

@@ -163,6 +163,13 @@ describe Chef::Application do
       @app.configure_logging
     end
 
+    it "should raise fatals if log location is invalid" do
+      Chef::Config[:log_location] = "/tmp/non-existing-dir/logfile"
+      Chef::Log.should_receive(:fatal).at_least(:once)
+      Process.should_receive(:exit)
+      @app.configure_logging
+    end
+
     shared_examples_for "log_level_is_auto" do
       context "when STDOUT is to a tty" do
         before do
@@ -306,11 +313,6 @@ describe Chef::Application do
         @config_file.unlink
       end
 
-      it "should raise informative fatals for missing log file dir" do
-        create_config_file('log_location "/tmp/non-existing-dir/logfile"')
-        raises_informative_fatals_on_configure_chef
-      end
-
       it "should raise informative fatals for badly written config" do
         create_config_file("text that should break the config parsing")
         raises_informative_fatals_on_configure_chef