chef 11.10.0.rc.0 → 11.10.0.rc.1

data/spec/functional/resource/registry_spec.rb

@@ -111,10 +111,10 @@ describe Chef::Resource::RegistryKey, :windows_only do
   before do
     @node.name("windowsbox")
 
-    @rest_client = mock("Chef::REST (mock)")
-    @rest_client.stub!(:create_url).and_return("reports/nodes/windowsbox/runs/#{@run_id}");
-    @rest_client.stub!(:raw_http_request).and_return({"result"=>"ok"});
-    @rest_client.stub!(:post_rest).and_return({"uri"=>"https://example.com/reports/nodes/windowsbox/runs/#{@run_id}"});
+    @rest_client = double("Chef::REST (mock)")
+    @rest_client.stub(:create_url).and_return("reports/nodes/windowsbox/runs/#{@run_id}");
+    @rest_client.stub(:raw_http_request).and_return({"result"=>"ok"});
+    @rest_client.stub(:post_rest).and_return({"uri"=>"https://example.com/reports/nodes/windowsbox/runs/#{@run_id}"});
 
     @resource_reporter = Chef::ResourceReporter.new(@rest_client)
     @events.register(@resource_reporter)
@@ -124,8 +124,8 @@ describe Chef::Resource::RegistryKey, :windows_only do
     @resource_reporter.run_started(@run_status)
 
     @new_resource.cookbook_name = "monkey"
-    @cookbook_version = mock("Cookbook::Version", :version => "1.2.3")
-    @new_resource.stub!(:cookbook_version).and_return(@cookbook_version)
+    @cookbook_version = double("Cookbook::Version", :version => "1.2.3")
+    @new_resource.stub(:cookbook_version).and_return(@cookbook_version)
   end
 
   after (:all) do
@@ -547,7 +547,7 @@ describe Chef::Resource::RegistryKey, :windows_only do
         @new_resource.values([{:name=>"BriskWalk",:type=>:string,:data=>"is good for health"}])
         @new_resource.recursive(false)
         @new_resource.run_action(:delete_key)
-        @new_resource.should_not raise_error(ArgumentError)
+        @new_resource.should_not raise_error
       end
       it "does nothing if the action is delete_key" do
         @new_resource.key(reg_parent + '\OpscodeWhyRun')

data/spec/functional/run_lock_spec.rb

@@ -163,7 +163,7 @@ describe Chef::RunLock do
     let!(:run_lock) { Chef::RunLock.new(lockfile) }
 
     it "creates the full path to the lockfile" do
-      lambda { run_lock.acquire }.should_not raise_error(Errno::ENOENT)
+      lambda { run_lock.acquire }.should_not raise_error
       File.should exist(lockfile)
     end
 

data/spec/integration/knife/download_spec.rb

@@ -973,7 +973,7 @@ EOM
     cookbook 'x', '1.0.0', { 'metadata.rb' => 'version "1.0.0"' }
 
     when_the_repository 'is empty' do
-      it 'knife download /cookbooks/x signs all requests' do
+      it 'knife download /cookbooks/x signs all requests', :ruby_gte_19_only do
 
         # Check that BasicClient.request() always gets called with X-OPS-USERID
         original_new = Chef::HTTP::BasicClient.method(:new)

data/spec/integration/solo/solo_spec.rb

@@ -79,7 +79,7 @@ EOM
           Process.waitpid(s1)
           Process.waitpid(s2)
         end
-      }.should_not raise_error(Timeout::Error)
+      }.should_not raise_error
 
       # Unfortunately file / directory helpers in integration tests
       # are implemented using before(:each) so we need to do all below

data/spec/spec_helper.rb

@@ -86,7 +86,6 @@ Dir["spec/support/**/*.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")

data/spec/stress/win32/file_spec.rb

@@ -25,10 +25,16 @@ describe 'Chef::ReservedNames::Win32::File', :windows_only do
   end
 
   it "should not leak memory" do
+    pending "Fix required for CHEF-5004"
     test = lambda { Chef::ReservedNames::Win32::File.symlink?(@path) }
     test.should_not leak_memory(:warmup => 50, :iterations => 100)
   end
 
+  it "should not leak significant memory" do
+    test = lambda { Chef::ReservedNames::Win32::File.symlink?(@path) }
+    test.should_not leak_memory(:warmup => 50000, :iterations => 100)
+  end
+
   it "should not leak handles" do
     test = lambda { Chef::ReservedNames::Win32::File.symlink?(@path) }
     test.should_not leak_handles(:warmup => 50, :iterations => 100)

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

@@ -34,7 +34,7 @@ class Chef
       end
 
       def something(arg=nil)
-        if arg == true or arg == false
+        if !arg.nil?
           @something = arg
         end
         @something

data/spec/support/mock/platform.rb

@@ -6,7 +6,7 @@
 # testing code that mixes in platform specific modules like +Chef::Mixin::Securable+
 # or +Chef::FileAccessControl+
 def platform_mock(platform = :unix, &block)
-  Chef::Platform.stub!(:windows?).and_return(platform == :windows ? true : false)
+  Chef::Platform.stub(:windows?).and_return(platform == :windows ? true : false)
   ENV['SYSTEMDRIVE'] = (platform == :windows ? 'C:' : nil)
   if block_given?
     mock_constants({"RUBY_PLATFORM" => (platform == :windows ? 'i386-mingw32' : 'x86_64-darwin11.2.0'),

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

@@ -16,8 +16,6 @@
 # limitations under the License.
 #
 
-require 'pry'
-
 shared_context "deploying with move" do
   before do
     Chef::Config[:file_backup_path] = CHEF_SPEC_BACKUP_PATH

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

@@ -482,7 +482,7 @@ shared_examples_for "a securable resource without existing target" do
 
       it 'warns when mode tries to set owner bits but owner is not specified' do
         @warn = []
-        Chef::Log.stub!(:warn) { |msg| @warn << msg }
+        Chef::Log.stub(:warn) { |msg| @warn << msg }
 
         resource.mode 0400
         resource.run_action(:create)
@@ -492,7 +492,7 @@ shared_examples_for "a securable resource without existing target" do
 
       it 'warns when mode tries to set group bits but group is not specified' do
         @warn = []
-        Chef::Log.stub!(:warn) { |msg| @warn << msg }
+        Chef::Log.stub(:warn) { |msg| @warn << msg }
 
         resource.mode 0040
         resource.run_action(:create)

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

@@ -72,7 +72,7 @@ shared_examples_for "an api error inspector" do
     before do
       @response_body = "synchronize the clock on your host"
       @response = Net::HTTPUnauthorized.new("1.1", "401", "(response) unauthorized")
-      @response.stub!(:body).and_return(@response_body)
+      @response.stub(:body).and_return(@response_body)
       @exception = Net::HTTPServerException.new("(exception) unauthorized", @response)
       @inspector = described_class.new(@node_name, @exception, @config)
       @inspector.add_explanation(@description)
@@ -88,7 +88,7 @@ shared_examples_for "an api error inspector" do
     before do
       @response_body = "check your key and node name"
       @response = Net::HTTPUnauthorized.new("1.1", "401", "(response) unauthorized")
-      @response.stub!(:body).and_return(@response_body)
+      @response.stub(:body).and_return(@response_body)
       @exception = Net::HTTPServerException.new("(exception) unauthorized", @response)
       @inspector = described_class.new(@node_name, @exception, @config)
       @inspector.add_explanation(@description)
@@ -104,7 +104,7 @@ shared_examples_for "an api error inspector" do
     before do
       @response_body = "forbidden"
       @response = Net::HTTPForbidden.new("1.1", "403", "(response) forbidden")
-      @response.stub!(:body).and_return(@response_body)
+      @response.stub(:body).and_return(@response_body)
       @exception = Net::HTTPServerException.new("(exception) forbidden", @response)
       @inspector = described_class.new(@node_name, @exception, @config)
       @inspector.add_explanation(@description)
@@ -120,7 +120,7 @@ shared_examples_for "an api error inspector" do
     before do
       @response_body = "didn't like your data"
       @response = Net::HTTPBadRequest.new("1.1", "400", "(response) bad request")
-      @response.stub!(:body).and_return(@response_body)
+      @response.stub(:body).and_return(@response_body)
       @exception = Net::HTTPServerException.new("(exception) bad request", @response)
       @inspector = described_class.new(@node_name, @exception, @config)
       @inspector.add_explanation(@description)
@@ -136,7 +136,7 @@ shared_examples_for "an api error inspector" do
     before do
       @response_body = "probably caused by a redirect to a get"
       @response = Net::HTTPNotFound.new("1.1", "404", "(response) not found")
-      @response.stub!(:body).and_return(@response_body)
+      @response.stub(:body).and_return(@response_body)
       @exception = Net::HTTPServerException.new("(exception) not found", @response)
       @inspector = described_class.new(@node_name, @exception, @config)
       @inspector.add_explanation(@description)
@@ -151,7 +151,7 @@ shared_examples_for "an api error inspector" do
     before do
       @response_body = "sad trombone"
       @response = Net::HTTPInternalServerError.new("1.1", "500", "(response) internal server error")
-      @response.stub!(:body).and_return(@response_body)
+      @response.stub(:body).and_return(@response_body)
       @exception = Net::HTTPFatalError.new("(exception) internal server error", @response)
       @inspector = described_class.new(@node_name, @exception, @config)
       @inspector.add_explanation(@description)
@@ -166,7 +166,7 @@ shared_examples_for "an api error inspector" do
     before do
       @response_body = "sad trombone orchestra"
       @response = Net::HTTPBadGateway.new("1.1", "502", "(response) bad gateway")
-      @response.stub!(:body).and_return(@response_body)
+      @response.stub(:body).and_return(@response_body)
       @exception = Net::HTTPFatalError.new("(exception) bad gateway", @response)
       @inspector = described_class.new(@node_name, @exception, @config)
       @inspector.add_explanation(@description)

data/spec/support/shared/unit/provider/file.rb

@@ -106,8 +106,46 @@ def setup_missing_enclosing_directory
   File.stub(:directory?).with(enclosing_directory).and_return(false)
 end
 
+# A File subclass that we use as a replacement for Tempfile. Some versions of
+# Tempfile call `File.exist?()` internally which will cause test failures if
+# `File.exist?()` has been stubbed.
+class BasicTempfile < ::File
+
+  def self.make_tmp_path(basename)
+    slug = "#{basename}-#{rand(1 << 128)}"
+    File.join(Dir.tmpdir, slug)
+  end
+
+  def self.new(basename)
+    super(make_tmp_path(basename), File::RDWR|File::CREAT|File::EXCL, 0600)
+  end
+
+  def unlink
+    self.class.unlink(path)
+  end
+
+end
+
 shared_examples_for Chef::Provider::File do
 
+  let(:tempfile_path) do
+  end
+
+  let!(:tempfile) do
+    BasicTempfile.new("rspec-shared-file-provider")
+  end
+
+  before(:each) do
+    content.stub(:tempfile).and_return(tempfile)
+    File.stub(:exist?).with(tempfile.path).and_call_original
+    File.stub(:exists?).with(tempfile.path).and_call_original
+  end
+
+  after do
+    tempfile.close if (tempfile && !tempfile.closed?)
+    File.unlink(tempfile.path) rescue nil
+  end
+
   it "should return a #{described_class}" do
     provider.should be_a_kind_of(described_class)
   end
@@ -220,11 +258,11 @@ shared_examples_for Chef::Provider::File do
         Chef::Platform.stub(:windows?).and_return(false)
         # mock up the filesystem to behave like unix
         setup_normal_file
-        stat_struct = mock("::File.stat", :mode => 0600, :uid => 0, :gid => 0, :mtime => 10000)
+        stat_struct = double("::File.stat", :mode => 0600, :uid => 0, :gid => 0, :mtime => 10000)
         resource_real_path = File.realpath(resource.path)
         File.should_receive(:stat).with(resource_real_path).at_least(:once).and_return(stat_struct)
-        Etc.stub(:getgrgid).with(0).and_return(mock("Group Ent", :name => "wheel"))
-        Etc.stub(:getpwuid).with(0).and_return(mock("User Ent", :name => "root"))
+        Etc.stub(:getgrgid).with(0).and_return(double("Group Ent", :name => "wheel"))
+        Etc.stub(:getpwuid).with(0).and_return(double("User Ent", :name => "root"))
       end
 
       context "when the new_resource does not specify any state" do
@@ -345,11 +383,11 @@ shared_examples_for Chef::Provider::File do
       Chef::Platform.stub(:windows?).and_return(false)
       # mock up the filesystem to behave like unix
       setup_normal_file
-      stat_struct = mock("::File.stat", :mode => 0600, :uid => 0, :gid => 0, :mtime => 10000)
+      stat_struct = double("::File.stat", :mode => 0600, :uid => 0, :gid => 0, :mtime => 10000)
       resource_real_path = File.realpath(resource.path)
       File.stub(:stat).with(resource_real_path).and_return(stat_struct)
-      Etc.stub(:getgrgid).with(0).and_return(mock("Group Ent", :name => "wheel"))
-      Etc.stub(:getpwuid).with(0).and_return(mock("User Ent", :name => "root"))
+      Etc.stub(:getgrgid).with(0).and_return(double("Group Ent", :name => "wheel"))
+      Etc.stub(:getpwuid).with(0).and_return(double("User Ent", :name => "root"))
       provider.send(:load_resource_attributes_from_file, resource)
     end
 
@@ -386,7 +424,7 @@ shared_examples_for Chef::Provider::File do
 
           it "does not raise an exception in why-run mode" do
             Chef::Config[:why_run] = true
-            lambda {provider.run_action(action)}.should_not raise_error(Chef::Exceptions::EnclosingDirectoryDoesNotExist)
+            lambda {provider.run_action(action)}.should_not raise_error
             Chef::Config[:why_run] = false
           end
         end
@@ -445,6 +483,7 @@ shared_examples_for Chef::Provider::File do
           tempfile = double('Tempfile', :path => "/tmp/foo-bar-baz")
           content.stub(:tempfile).and_return(tempfile)
           File.should_receive(:exists?).with("/tmp/foo-bar-baz").and_return(true)
+          tempfile.should_receive(:close).once
           tempfile.should_receive(:unlink).once
         end
 
@@ -635,7 +674,7 @@ shared_examples_for Chef::Provider::File do
       it "should not try to backup or delete the file, and should not be updated by last action" do
         provider.should_not_receive(:do_backup)
         File.should_not_receive(:delete)
-        lambda { provider.run_action(:delete) }.should_not raise_error()
+        lambda { provider.run_action(:delete) }.should_not raise_error
         resource.should_not be_updated_by_last_action
       end
     end

data/spec/support/shared/unit/provider/useradd_based_user_provider.rb

@@ -57,21 +57,21 @@ shared_examples_for "a useradd-based user provider" do |supported_useradd_option
       end
 
       it "should set the option for #{attribute} if the new resources #{attribute} is not nil" do
-        @new_resource.stub!(attribute).and_return("hola")
+        @new_resource.stub(attribute).and_return("hola")
         provider.universal_options.should eql([option, 'hola'])
       end
 
       it "should set the option for #{attribute} if the new resources #{attribute} is not nil, without homedir management" do
-        @new_resource.stub!(:supports).and_return({:manage_home => false,
+        @new_resource.stub(:supports).and_return({:manage_home => false,
                                                     :non_unique => false})
-        @new_resource.stub!(attribute).and_return("hola")
+        @new_resource.stub(attribute).and_return("hola")
         provider.universal_options.should eql([option, 'hola'])
       end
 
       it "should set the option for #{attribute} if the new resources #{attribute} is not nil, without homedir management (using real attributes)" do
-        @new_resource.stub!(:manage_home).and_return(false)
-        @new_resource.stub!(:non_unique).and_return(false)
-        @new_resource.stub!(attribute).and_return("hola")
+        @new_resource.stub(:manage_home).and_return(false)
+        @new_resource.stub(:non_unique).and_return(false)
+        @new_resource.stub(attribute).and_return("hola")
         provider.universal_options.should eql([option, 'hola'])
       end
     end
@@ -79,7 +79,7 @@ shared_examples_for "a useradd-based user provider" do |supported_useradd_option
     it "should combine all the possible options" do
       combined_opts = []
       supported_useradd_options.sort{ |a,b| a[0] <=> b[0] }.each do |attribute, option|
-        @new_resource.stub!(attribute).and_return("hola")
+        @new_resource.stub(attribute).and_return("hola")
         combined_opts << option << 'hola'
       end
       provider.universal_options.should eql(combined_opts)
@@ -99,8 +99,8 @@ shared_examples_for "a useradd-based user provider" do |supported_useradd_option
 
     describe "when the resource has a different home directory and supports home directory management" do
       before do
-        @new_resource.stub!(:home).and_return("/wowaweea")
-        @new_resource.stub!(:supports).and_return({:manage_home => true,
+        @new_resource.stub(:home).and_return("/wowaweea")
+        @new_resource.stub(:supports).and_return({:manage_home => true,
                                                    :non_unique => false})
       end
 
@@ -112,9 +112,9 @@ shared_examples_for "a useradd-based user provider" do |supported_useradd_option
 
     describe "when the resource has a different home directory and supports home directory management (using real attributes)" do
       before do
-        @new_resource.stub!(:home).and_return("/wowaweea")
-        @new_resource.stub!(:manage_home).and_return(true)
-        @new_resource.stub!(:non_unique).and_return(false)
+        @new_resource.stub(:home).and_return("/wowaweea")
+        @new_resource.stub(:manage_home).and_return(true)
+        @new_resource.stub(:non_unique).and_return(false)
       end
 
       it "should set -m -d /homedir" do
@@ -125,7 +125,7 @@ shared_examples_for "a useradd-based user provider" do |supported_useradd_option
 
     describe "when the resource supports non_unique ids" do
       before do
-        @new_resource.stub!(:supports).and_return({:manage_home => false,
+        @new_resource.stub(:supports).and_return({:manage_home => false,
                                                   :non_unique => true})
       end
 
@@ -136,8 +136,8 @@ shared_examples_for "a useradd-based user provider" do |supported_useradd_option
 
     describe "when the resource supports non_unique ids (using real attributes)" do
       before do
-        @new_resource.stub!(:manage_home).and_return(false)
-        @new_resource.stub!(:non_unique).and_return(true)
+        @new_resource.stub(:manage_home).and_return(false)
+        @new_resource.stub(:non_unique).and_return(true)
       end
 
       it "should set -m -o" do
@@ -260,12 +260,12 @@ shared_examples_for "a useradd-based user provider" do |supported_useradd_option
   describe "when checking the lock" do
     # lazy initialize so we can modify stdout and stderr strings
     let(:passwd_s_status) do
-      mock("Mixlib::ShellOut command", :exitstatus => 0, :stdout => @stdout, :stderr => @stderr)
+      double("Mixlib::ShellOut command", :exitstatus => 0, :stdout => @stdout, :stderr => @stderr)
     end
 
     before(:each) do
       # @node = Chef::Node.new
-      # @new_resource = mock("Chef::Resource::User",
+      # @new_resource = double("Chef::Resource::User",
       #   :nil_object => true,
       #   :username => "adam"
       # )
@@ -313,9 +313,9 @@ shared_examples_for "a useradd-based user provider" do |supported_useradd_option
         provider.should_receive(:shell_out!).
           with("passwd", "-S", @new_resource.username, {:returns=>[0, 1]}).
           and_return(passwd_s_status)
-        rpm_status = mock("Mixlib::ShellOut command", :exitstatus => 0, :stdout => "passwd-0.73-1\n", :stderr => "")
+        rpm_status = double("Mixlib::ShellOut command", :exitstatus => 0, :stdout => "passwd-0.73-1\n", :stderr => "")
         provider.should_receive(:shell_out!).with("rpm -q passwd").and_return(rpm_status)
-        lambda { provider.check_lock }.should_not raise_error(Chef::Exceptions::User)
+        lambda { provider.check_lock }.should_not raise_error
       end
 
       it "should raise a Chef::Exceptions::User if passwd -S exits with 1 on #{os} and the passwd package is not version 0.73-1" do
@@ -324,7 +324,7 @@ shared_examples_for "a useradd-based user provider" do |supported_useradd_option
         provider.should_receive(:shell_out!).
           with("passwd", "-S", @new_resource.username, {:returns=>[0, 1]}).
           and_return(passwd_s_status)
-        rpm_status = mock("Mixlib::ShellOut command", :exitstatus => 0, :stdout => "passwd-0.73-2\n", :stderr => "")
+        rpm_status = double("Mixlib::ShellOut command", :exitstatus => 0, :stdout => "passwd-0.73-2\n", :stderr => "")
         provider.should_receive(:shell_out!).with("rpm -q passwd").and_return(rpm_status)
         lambda { provider.check_lock }.should raise_error(Chef::Exceptions::User)
       end
@@ -338,7 +338,7 @@ shared_examples_for "a useradd-based user provider" do |supported_useradd_option
 
     context "when in why run mode" do
       before do
-        passwd_status = mock("Mixlib::ShellOut command", :exitstatus => 0, :stdout => "", :stderr => "passwd: user 'chef-test' does not exist\n")
+        passwd_status = double("Mixlib::ShellOut command", :exitstatus => 0, :stdout => "", :stderr => "passwd: user 'chef-test' does not exist\n")
         provider.should_receive(:shell_out!).
           with("passwd", "-S", @new_resource.username, {:returns=>[0, 1]}).
           and_return(passwd_status)
@@ -398,9 +398,9 @@ shared_examples_for "a useradd-based user provider" do |supported_useradd_option
     ].each do |home_check|
       it home_check["action"] do
         provider.current_resource.home home_check["current_resource_home"].first
-        @current_home_mock = mock("Pathname")
+        @current_home_mock = double("Pathname")
         provider.new_resource.home home_check["new_resource_home"].first
-        @new_home_mock = mock("Pathname")
+        @new_home_mock = double("Pathname")
 
         Pathname.should_receive(:new).with(@current_resource.home).and_return(@current_home_mock)
         @current_home_mock.should_receive(:cleanpath).and_return(home_check["current_resource_home"].last)

data/spec/unit/api_client/registration_spec.rb

@@ -50,10 +50,10 @@ describe Chef::ApiClient::Registration do
   end
 
   describe "when creating/updating the client on the server" do
-    let(:http_mock) { mock("Chef::REST mock") }
+    let(:http_mock) { double("Chef::REST mock") }
 
     before do
-      registration.stub!(:http_api).and_return(http_mock)
+      registration.stub(:http_api).and_return(http_mock)
     end
 
     it "creates a new ApiClient on the server using the validator identity" do
@@ -103,7 +103,7 @@ describe Chef::ApiClient::Registration do
 
   describe "when writing the private key to disk" do
     before do
-      registration.stub!(:private_key).and_return('--begin rsa key etc--')
+      registration.stub(:private_key).and_return('--begin rsa key etc--')
     end
 
     # Permission read via File.stat is busted on windows, though creating the
@@ -125,10 +125,10 @@ describe Chef::ApiClient::Registration do
 
   describe "when registering a client" do
 
-    let(:http_mock) { mock("Chef::REST mock") }
+    let(:http_mock) { double("Chef::REST mock") }
 
     before do
-      registration.stub!(:http_api).and_return(http_mock)
+      registration.stub(:http_api).and_return(http_mock)
     end
 
     it "creates the client on the server and writes the key" do