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

data/spec/unit/provider/package/rpm_spec.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,35 +23,35 @@ describe Chef::Provider::Package::Rpm do
     @node = Chef::Node.new
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
-    
+
     @new_resource = Chef::Resource::Package.new("emacs")
     @new_resource.source "/tmp/emacs-21.4-20.el5.i386.rpm"
-    
+
     @provider = Chef::Provider::Package::Rpm.new(@new_resource, @run_context)
-    
+
     @status = mock("Status", :exitstatus => 0)
     ::File.stub!(:exists?).and_return(true)
   end
-  
+
   describe "when determining the current state of the package" do
-  
+
     it "should create a current resource with the name of new_resource" do
       @provider.stub!(:popen4).and_return(@status)
       @provider.load_current_resource
       @provider.current_resource.name.should == "emacs"
     end
-  
+
     it "should set the current reource package name to the new resource package name" do
       @provider.stub!(:popen4).and_return(@status)
       @provider.load_current_resource
       @provider.current_resource.package_name.should == 'emacs'
     end
-  
+
     it "should raise an exception if a source is supplied but not found" do
       ::File.stub!(:exists?).and_return(false)
       lambda { @provider.run_action(:any) }.should raise_error(Chef::Exceptions::Package)
     end
-  
+
     it "should get the source package version from rpm if provided" do
       @stdout = StringIO.new("emacs 21.4-20.el5")
       @provider.should_receive(:popen4).with("rpm -qp --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' /tmp/emacs-21.4-20.el5.i386.rpm").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
@@ -60,7 +60,7 @@ describe Chef::Provider::Package::Rpm do
       @provider.current_resource.package_name.should == "emacs"
       @provider.new_resource.version.should == "21.4-20.el5"
     end
-  
+
     it "should return the current version installed if found by rpm" do
       @stdout = StringIO.new("emacs 21.4-20.el5")
       @provider.should_receive(:popen4).with("rpm -qp --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' /tmp/emacs-21.4-20.el5.i386.rpm").and_return(@status)
@@ -68,20 +68,20 @@ describe Chef::Provider::Package::Rpm do
       @provider.load_current_resource
       @provider.current_resource.version.should == "21.4-20.el5"
     end
-  
+
     it "should raise an exception if the source is not set but we are installing" do
       new_resource = Chef::Resource::Package.new("emacs")
       provider = Chef::Provider::Package::Rpm.new(new_resource, @run_context)
       lambda { provider.run_action(:any) }.should raise_error(Chef::Exceptions::Package)
     end
-  
+
     it "should raise an exception if rpm fails to run" do
       status = mock("Status", :exitstatus => -1)
       @provider.stub!(:popen4).and_return(status)
       lambda { @provider.run_action(:any) }.should raise_error(Chef::Exceptions::Package)
     end
   end
-  
+
   describe "after the current resource is loaded" do
     before do
       @current_resource = Chef::Resource::Package.new("emacs")
@@ -95,7 +95,7 @@ describe Chef::Provider::Package::Rpm do
         })
         @provider.install_package("emacs", "21.4-20.el5")
       end
-  
+
       it "should run rpm -U with the package source to upgrade" do
         @current_resource.version("21.4-19.el5")
         @provider.should_receive(:run_command_with_systems_locale).with({

data/spec/unit/provider/package/smartos_spec.rb

@@ -27,8 +27,8 @@ describe Chef::Provider::Package::SmartOS, "load_current_resource" do
     @run_context = Chef::RunContext.new(@node, {}, @events)
     @new_resource     = Chef::Resource::Package.new("varnish")
     @current_resource = Chef::Resource::Package.new("varnish")
-		
-	
+
+
 	  @status = mock("Status", :exitstatus => 0)
 		@provider = Chef::Provider::Package::SmartOS.new(@new_resource, @run_context)
 		Chef::Resource::Package.stub!(:new).and_return(@current_resource)
@@ -69,8 +69,26 @@ describe Chef::Provider::Package::SmartOS, "load_current_resource" do
 
 	end
 
+  describe "candidate_version" do
+    it "should return the candidate_version variable if already setup" do
+      @provider.candidate_version = "2.1.1"
+      @provider.should_not_receive(:shell_out!)
+      @provider.candidate_version
+    end
+
+    it "should lookup the candidate_version if the variable is not already set" do
+      search = mock()
+      search.should_receive(:each_line).
+        and_yield("something-varnish-1.1.1  something varnish like\n").
+        and_yield("varnish-2.3.4 actual varnish\n")
+      @shell_out = mock('shell_out!', :stdout => search)
+      @provider.should_receive(:shell_out!).with('/opt/local/bin/pkgin se varnish', :env => nil, :returns => [0,1]).and_return(@shell_out)
+      @provider.candidate_version.should == "2.3.4"
+    end
+  end
+
 	describe "when manipulating a resource" do
-	
+
 		it "run pkgin and install the package" do
 			out = OpenStruct.new(:stdout => nil)
       @provider.should_receive(:shell_out!).with("/opt/local/sbin/pkg_info -E \"varnish*\"", {:env => nil, :returns=>[0,1]}).and_return(@shell_out)

data/spec/unit/provider/package_spec.rb

@@ -286,7 +286,7 @@ describe Chef::Provider::Package do
       @provider.should_not_receive(:reconfig_package)
       @provider.run_action(:reconfig)
       @new_resource.should_not be_updated_by_last_action
-    end 
+    end
 
     it "should debug log and not reconfigure the package if no response_file is given" do
       @current_resource.stub!(:version).and_return('1.0')
@@ -345,7 +345,9 @@ describe Chef::Provider::Package do
       cl = Chef::CookbookLoader.new(@cookbook_repo)
       cl.load_cookbooks
       @cookbook_collection = Chef::CookbookCollection.new(cl)
+
       @run_context = Chef::RunContext.new(@node, @cookbook_collection, @events)
+      @provider.run_context = @run_context
 
       @node.automatic_attrs[:platform] = 'PLATFORM: just testing'
       @node.automatic_attrs[:platform_version] = 'PLATFORM VERSION: just testing'
@@ -358,8 +360,8 @@ describe Chef::Provider::Package do
       before do
         Chef::FileCache.should_receive(:create_cache_path).with('preseed/java').and_return("/tmp/preseed/java")
       end
+
       it "sets the preseed resource's runcontext to its own run context" do
-        Chef::FileCache.rspec_reset
         Chef::FileCache.stub!(:create_cache_path).and_return("/tmp/preseed/java")
         @provider.preseed_resource('java', '6').run_context.should_not be_nil
         @provider.preseed_resource('java', '6').run_context.should equal(@provider.run_context)

data/spec/unit/provider/powershell_spec.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.
@@ -24,7 +24,7 @@ describe Chef::Provider::PowershellScript, "action_run" do
 
     @node.default["kernel"] = Hash.new
     @node.default["kernel"][:machine] = :x86_64.to_s
-    
+
     @run_context = Chef::RunContext.new(@node, {}, @events)
     @new_resource = Chef::Resource::PowershellScript.new('run some powershell code', @run_context)
 

data/spec/unit/provider/remote_directory_spec.rb

@@ -57,10 +57,10 @@ describe Chef::Provider::RemoteDirectory do
       @provider_second_run.run_action(:create)
     end
     it "identifies that the state has changed the after first run" do
-      @provider_second_run.new_resource.updated_by_last_action? == true 
+      @provider_second_run.new_resource.updated_by_last_action? == true
     end
     it "identifies that the state has not changed after the second run" do
-      @provider_second_run.new_resource.updated_by_last_action? == false 
+      @provider_second_run.new_resource.updated_by_last_action? == false
     end
   end
 

data/spec/unit/provider/remote_file/ftp_spec.rb

@@ -200,16 +200,11 @@ describe Chef::Provider::RemoteFile::FTP do
 
     context "and proxying is enabled" do
       before do
-        @original_config = Chef::Config.hash_dup
         Chef::Config[:ftp_proxy] = "socks5://socks.example.com:5000"
         Chef::Config[:ftp_proxy_user] = "bill"
         Chef::Config[:ftp_proxy_pass] = "ted"
       end
 
-      after do
-        Chef::Config.configuration = @original_config
-      end
-
       it "fetches the file via the proxy" do
         current_socks_server = ENV["SOCKS_SERVER"]
         ENV.should_receive(:[]=).with("SOCKS_SERVER", "socks5://bill:ted@socks.example.com:5000").ordered

data/spec/unit/provider/remote_file/http_spec.rb

@@ -155,16 +155,16 @@ describe Chef::Provider::RemoteFile::HTTP do
   describe "when fetching the uri" do
 
     let(:expected_http_opts) { {} }
-    let(:expected_http_args) { [uri, nil, nil, expected_http_opts] }
+    let(:expected_http_args) { [uri, expected_http_opts] }
 
     let(:tempfile_path) { "/tmp/chef-mock-tempfile-abc123" }
 
-    let(:tempfile) { mock(Tempfile, :path => tempfile_path) }
+    let(:tempfile) { mock(Tempfile, :path => tempfile_path, :close => nil) }
 
     let(:last_response) { {} }
 
     let(:rest) do
-      rest = mock(Chef::REST)
+      rest = mock(Chef::HTTP::Simple)
       rest.stub!(:streaming_request).and_return(tempfile)
       rest.stub!(:last_response).and_return(last_response)
       rest
@@ -175,32 +175,16 @@ describe Chef::Provider::RemoteFile::HTTP do
       new_resource.use_last_modified(false)
       Chef::Provider::RemoteFile::CacheControlData.should_receive(:load_and_validate).with(uri, current_resource_checksum).and_return(cache_control_data)
 
-      Chef::REST.should_receive(:new).with(*expected_http_args).and_return(rest)
+      Chef::HTTP::Simple.should_receive(:new).with(*expected_http_args).and_return(rest)
     end
 
 
     describe "and the request does not return new content" do
 
-      it "should propagate non-304 exceptions to the caller" do
-        r = Net::HTTPBadRequest.new("one", "two", "three")
-        e = Net::HTTPServerException.new("fake exception", r)
-        rest.stub!(:streaming_request).and_raise(e)
-        lambda { fetcher.fetch }.should raise_error(Net::HTTPServerException)
-      end
-
-      it "should return HTTPRetriableError when Chef::REST returns a 301" do
-        r = Net::HTTPMovedPermanently.new("one", "two", "three")
-        e = Net::HTTPRetriableError.new("301", r)
-        rest.stub!(:streaming_request).and_raise(e)
-        lambda { fetcher.fetch }.should raise_error(Net::HTTPRetriableError)
-      end
-
       it "should return a nil tempfile for a 304 HTTPNotModifed" do
-        r = Net::HTTPNotModified.new("one", "two", "three")
-        e = Net::HTTPRetriableError.new("304", r)
-        rest.stub!(:streaming_request).and_raise(e)
-        result = fetcher.fetch
-        result.should be_nil
+        # Streaming request returns nil for 304 errors
+        rest.stub(:streaming_request).and_return(nil)
+        fetcher.fetch.should be_nil
       end
 
     end
@@ -290,21 +274,21 @@ describe Chef::Provider::RemoteFile::HTTP do
 
         # CHEF-3140
         # Some servers return tarballs as content type tar and encoding gzip, which
-        # is totally wrong. When this happens and gzip isn't disabled, Chef::REST
+        # is totally wrong. When this happens and gzip isn't disabled, Chef::HTTP::Simple
         # will decompress the file for you, which is not at all what you expected
         # to happen (you end up with an uncomressed tar archive instead of the
         # gzipped tar archive you expected). To work around this behavior, we
         # detect when users are fetching gzipped files and turn off gzip in
-        # Chef::REST.
+        # Chef::HTTP::Simple.
 
         it "should disable gzip compression in the client" do
           # Before block in the parent context has set an expectation on
-          # Chef::REST.new() being called with expected arguments. Here we fufil
+          # Chef::HTTP::Simple.new() being called with expected arguments. Here we fufil
           # that expectation, so that we can explicitly set it for this test.
           # This is intended to provide insurance that refactoring of the parent
           # context does not negate the value of this particular example.
-          Chef::REST.new(*expected_http_args)
-          Chef::REST.should_receive(:new).once.with(*expected_http_args).and_return(rest)
+          Chef::HTTP::Simple.new(*expected_http_args)
+          Chef::HTTP::Simple.should_receive(:new).once.with(*expected_http_args).and_return(rest)
           fetcher.fetch
           cache_control_data.etag.should be_nil
           cache_control_data.mtime.should be_nil

data/spec/unit/provider/remote_file/local_file_spec.rb

@@ -40,7 +40,7 @@ describe Chef::Provider::RemoteFile::LocalFile do
 
   describe "when fetching the object" do
 
-    let(:tempfile) { mock("Tempfile", :path => "/tmp/foo/bar/nyan.png") }
+    let(:tempfile) { mock("Tempfile", :path => "/tmp/foo/bar/nyan.png", :close => nil) }
     let(:chef_tempfile) { mock("Chef::FileContentManagement::Tempfile", :tempfile => tempfile) }
 
     before do
@@ -50,6 +50,7 @@ describe Chef::Provider::RemoteFile::LocalFile do
     it "stages the local file to a temporary file" do
       Chef::FileContentManagement::Tempfile.should_receive(:new).with(new_resource).and_return(chef_tempfile)
       ::FileUtils.should_receive(:cp).with(uri.path, tempfile.path)
+      tempfile.should_receive(:close)            
 
       result = fetcher.fetch
       result.should == tempfile

data/spec/unit/provider/route_spec.rb

@@ -111,13 +111,13 @@ describe Chef::Provider::Route do
 
     it "should not delete config file for :add action (CHEF-3332)" do
       @node.automatic_attrs[:platform] = 'centos'
-  
+
       route_file = StringIO.new
       File.should_receive(:new).and_return(route_file)
       @resource_add = Chef::Resource::Route.new('192.168.1.0/24 via 192.168.0.1')
       @run_context.resource_collection << @resource_add
       @provider.stub!(:run_command).and_return(true)
-  
+
       @resource_add.action(:add)
       @provider.run_action(:add)
       route_file.string.split("\n").should have(1).items

data/spec/unit/provider/ruby_block_spec.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.

data/spec/unit/provider/service/arch_service_spec.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.
@@ -61,8 +61,8 @@ describe Chef::Provider::Service::Arch, "load_current_resource" do
       @provider.should_receive(:shell_out).with("/etc/rc.d/chef status").and_return(OpenStruct.new(:exitstatus => 0))
       @provider.load_current_resource
     end
-  
-    it "should set running to true if the the status command returns 0" do
+
+    it "should set running to true if the status command returns 0" do
       @provider.stub!(:shell_out).with("/etc/rc.d/chef status").and_return(OpenStruct.new(:exitstatus => 0))
       @provider.load_current_resource
       @provider.current_resource.running.should be_true
@@ -92,7 +92,7 @@ describe Chef::Provider::Service::Arch, "load_current_resource" do
       @provider.should_receive(:shell_out).with("/etc/rc.d/chefhasmonkeypants status").and_return(OpenStruct.new(:exitstatus => 0))
       @provider.load_current_resource
     end
-    
+
   end
 
   it "should raise error if the node has a nil ps attribute and no other means to get status" do
@@ -129,7 +129,7 @@ aj        8119  6041  0 21:34 pts/3    00:00:03 vi init_service_spec.rb
 DEFAULT_PS
       @status = mock("Status", :exitstatus => 0, :stdout => @stdout)
       @provider.stub!(:shell_out!).and_return(@status)
-      
+
       @node.automatic_attrs[:command] = {:ps => "ps -ef"}
     end
 
@@ -139,7 +139,7 @@ aj        7842  5057  0 21:26 pts/2    00:00:06 chef
 aj        7842  5057  0 21:26 pts/2    00:00:06 poos
 RUNNING_PS
       @status.stub!(:stdout).and_return(@stdout)
-      @provider.load_current_resource 
+      @provider.load_current_resource
       @provider.current_resource.running.should be_true
     end
 
@@ -162,13 +162,13 @@ RUNNING_PS
     ::File.stub!(:read).with("/etc/rc.conf").and_return("DAEMONS=(network !apache ssh)")
     @provider.daemons.should == ['network', '!apache', 'ssh']
   end
-  
+
   context "when the current service status is known" do
     before do
       @current_resource = Chef::Resource::Service.new("chef")
       @provider.current_resource = @current_resource
     end
-    
+
     describe Chef::Provider::Service::Arch, "enable_service" do
       # before(:each) do
       #   @new_resource = mock("Chef::Resource::Service",
@@ -178,7 +178,7 @@ RUNNING_PS
       #     :running => false
       #   )
       #   @new_resource.stub!(:start_command).and_return(false)
-      # 
+      #
       #   @provider = Chef::Provider::Service::Arch.new(@node, @new_resource)
       #   Chef::Resource::Service.stub!(:new).and_return(@current_resource)
       # end
@@ -199,7 +199,7 @@ RUNNING_PS
       #     :running => false
       #   )
       #   @new_resource.stub!(:start_command).and_return(false)
-      # 
+      #
       #   @provider = Chef::Provider::Service::Arch.new(@node, @new_resource)
       #   Chef::Resource::Service.stub!(:new).and_return(@current_resource)
       # end
@@ -221,11 +221,11 @@ RUNNING_PS
       #     :running => false
       #   )
       #   @new_resource.stub!(:start_command).and_return(false)
-      # 
+      #
       #   @provider = Chef::Provider::Service::Arch.new(@node, @new_resource)
       #   Chef::Resource::Service.stub!(:new).and_return(@current_resource)
       # end
-  
+
       it "should call the start command if one is specified" do
         @new_resource.stub!(:start_command).and_return("/etc/rc.d/chef startyousillysally")
         @provider.should_receive(:shell_out!).with("/etc/rc.d/chef startyousillysally")
@@ -235,7 +235,7 @@ RUNNING_PS
       it "should call '/etc/rc.d/service_name start' if no start command is specified" do
         @provider.should_receive(:shell_out!).with("/etc/rc.d/#{@new_resource.service_name} start")
         @provider.start_service()
-      end 
+      end
     end
 
     describe Chef::Provider::Service::Arch, "stop_service" do
@@ -247,7 +247,7 @@ RUNNING_PS
       #     :running => false
       #   )
       #   @new_resource.stub!(:stop_command).and_return(false)
-      # 
+      #
       #   @provider = Chef::Provider::Service::Arch.new(@node, @new_resource)
       #   Chef::Resource::Service.stub!(:new).and_return(@current_resource)
       # end
@@ -274,7 +274,7 @@ RUNNING_PS
       #   )
       #   @new_resource.stub!(:restart_command).and_return(false)
       #   @new_resource.stub!(:supports).and_return({:restart => false})
-      # 
+      #
       #   @provider = Chef::Provider::Service::Arch.new(@node, @new_resource)
       #   Chef::Resource::Service.stub!(:new).and_return(@current_resource)
       # end
@@ -309,7 +309,7 @@ RUNNING_PS
       #   )
       #   @new_resource.stub!(:reload_command).and_return(false)
       #   @new_resource.stub!(:supports).and_return({:reload => false})
-      # 
+      #
       #   @provider = Chef::Provider::Service::Arch.new(@node, @new_resource)
       #   Chef::Resource::Service.stub!(:new).and_return(@current_resource)
       # end