chef 10.26.0 → 10.28.0.rc.0

data/lib/chef/provider/package/yum.rb

@@ -16,8 +16,10 @@
 # limitations under the License.
 #
 
+require 'chef/config'
 require 'chef/provider/package'
 require 'chef/mixin/command'
+require 'chef/mixin/shell_out'
 require 'chef/resource/package'
 require 'singleton'
 require 'chef/mixin/get_source_from_package'
@@ -645,6 +647,7 @@ class Chef
         # Cache for our installed and available packages, pulled in from yum-dump.py
         class YumCache
           include Chef::Mixin::Command
+          include Chef::Mixin::ShellOut
           include Singleton
 
           def initialize
@@ -705,9 +708,11 @@ class Chef
             error = nil
 
             helper = ::File.join(::File.dirname(__FILE__), 'yum-dump.py')
+            status = nil
 
-            status = popen4("/usr/bin/python #{helper}#{opts}", :waitlast => true) do |pid, stdin, stdout, stderr|
-              stdout.each do |line|
+            begin
+              status = shell_out!("/usr/bin/python #{helper}#{opts}", :timeout => Chef::Config[:yum_timeout])
+              status.stdout.each_line do |line|
                 one_line = true
 
                 line.chomp!
@@ -754,7 +759,10 @@ class Chef
                 @rpmdb << pkg
               end
 
-              error = stderr.readlines
+              error = status.stderr
+            rescue Mixlib::ShellOut::CommandTimeout => e
+              Chef::Log.error("#{helper} exceeded timeout #{Chef::Config[:yum_timeout]}")
+              raise(e)
             end
 
             if status.exitstatus != 0
@@ -981,7 +989,7 @@ class Chef
         end
 
         def yum_command(command)
-          status, stdout, stderr = output_of_command(command, {})
+          status, stdout, stderr = output_of_command(command, {:timeout => Chef::Config[:yum_timeout]})
 
           # This is fun: rpm can encounter errors in the %post/%postun scripts which aren't
           # considered fatal - meaning the rpm is still successfully installed. These issue
@@ -998,7 +1006,7 @@ class Chef
               if l =~ %r{^error: %(post|postun)\(.*\) scriptlet failed, exit status \d+$}
                 Chef::Log.warn("#{@new_resource} caught non-fatal scriptlet issue: \"#{l}\". Can't trust yum exit status " +
                                "so running install again to verify.")
-                status, stdout, stderr = output_of_command(command, {})
+                status, stdout, stderr = output_of_command(command, {:timeout => Chef::Config[:yum_timeout]})
                 break
               end
             end
@@ -1062,13 +1070,11 @@ class Chef
             end
 
             Chef::Log.debug("#{@new_resource} checking rpm status")
-            status = popen4("rpm -qp --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' #{@new_resource.source}") do |pid, stdin, stdout, stderr|
-              stdout.each do |line|
-                case line
-                when /([\w\d_.-]+)\s([\w\d_.-]+)/
-                  @current_resource.package_name($1)
-                  @new_resource.version($2)
-                end
+            shell_out!("rpm -qp --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' #{@new_resource.source}", :timeout => Chef::Config[:yum_timeout]).stdout.each_line do |line|
+              case line
+              when /([\w\d_.-]+)\s([\w\d_.-]+)/
+                @current_resource.package_name($1)
+                @new_resource.version($2)
               end
             end
           end

data/lib/chef/resource.rb

@@ -789,16 +789,18 @@ F
 
         # create a new constructor that wraps the old one and adds the actions
         # specified in the DSL
-        old_init = instance_method(:initialize)
+        alias_method :old_init, :initialize
 
-        define_method(:initialize) do |name, *optional_args|
-          args_run_context = optional_args.shift
-          @resource_name = rname.to_sym
-          old_init.bind(self).call(name, args_run_context)
+        new_init =<<INIT
+        def initialize(name, run_context=nil)
+          @resource_name = "#{rname}".to_sym
+          old_init(name, run_context)
           @action = self.class.action_to_set_default || @action
           allowed_actions.push(self.class.actions_to_create).flatten!
-        end
-      end
+       end
+INIT
+      class_eval(new_init)
+    end
 
       # register new class as a Chef::Resource
       class_name = convert_to_class_name(rname)

data/lib/chef/version.rb

@@ -17,7 +17,7 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '10.26.0'
+  VERSION = '10.28.0.rc.0'
 end
 
 # NOTE: the Chef::Version class is defined in version_class.rb

data/spec/data/cookbooks/openldap/files/default/.dotfile

@@ -0,0 +1 @@
+I am here to test .dotfiles work in file directories.

data/spec/data/cookbooks/openldap/files/default/.ssh/id_rsa

@@ -0,0 +1 @@
+FAKE KEY

data/spec/data/cookbooks/openldap/files/default/remotedir/.a_dotdir/.a_dotfile_in_a_dotdir

@@ -0,0 +1 @@
+this is a dotfile in a dotdir

data/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/.a_dotfile

@@ -0,0 +1 @@
+this is a file with a name beginning with a . dot

data/spec/functional/knife/cookbook_delete_spec.rb

@@ -42,7 +42,7 @@ describe Chef::Knife::CookbookDelete do
     @server.stop
   end
 
-  context "when the the cookbook doesn't exist" do
+  context "when the cookbook doesn't exist" do
     before do
       @log_output = StringIO.new
 

data/spec/unit/checksum/storage/filesystem_spec.rb

@@ -36,7 +36,7 @@ describe Chef::Checksum::Storage::Filesystem do
     @storage.file_location.should == "/var/chef/checksums/3f/3fafecfb15585ede6b840158cbc2f399"
   end
 
-  it "has the path the the file's subdirectory in the checksum repo" do
+  it "has the path to the file's subdirectory in the checksum repo" do
     @storage.checksum_repo_directory.should == "/var/chef/checksums/3f"
   end
 

data/spec/unit/cookbook/synchronizer_spec.rb

@@ -63,6 +63,7 @@ describe Chef::CookbookSynchronizer do
                                    "checksum" => "abc456" }
     @cookbook_a_manifest["attributes"] = [ @cookbook_a_default_attrs ]
     @cookbook_a_manifest["templates"] = [{"path" => "templates/default/apache2.conf.erb", "url" => "http://chef.example.com/ffffff"}]
+    @cookbook_a_manifest["files"] = [{"path" => "files/default/megaman.conf", "url" => "http://chef.example.com/megaman.conf"}]
     @cookbook_a.manifest = @cookbook_a_manifest
     @cookbook_manifest["cookbook_a"] = @cookbook_a
 
@@ -102,7 +103,7 @@ describe Chef::CookbookSynchronizer do
     before do
       # Would rather not stub out methods on the test subject, but setting up
       # the state is a PITA and tests for this behavior are above.
-      @synchronizer.should_receive(:clear_obsoleted_cookbooks)
+      @synchronizer.stub!(:clear_obsoleted_cookbooks)
 
       @server_api = mock("Chef::REST (mock)")
       @file_cache = mock("Chef::FileCache (mock)")
@@ -162,6 +163,53 @@ describe Chef::CookbookSynchronizer do
         @synchronizer.sync_cookbooks
       end
 
+      context "Chef::Config[:no_lazy_load] is true" do
+        before do
+          Chef::Config[:no_lazy_load] = true
+          @synchronizer = Chef::CookbookSynchronizer.new(@cookbook_manifest, @events)
+          @synchronizer.stub!(:server_api).and_return(@server_api)
+          @synchronizer.stub!(:cache).and_return(@file_cache)
+          @synchronizer.stub!(:clear_obsoleted_cookbooks)
+
+          @cookbook_a_file_default_tempfile = mock("Tempfile for cookbook_a megaman.conf file",
+                                                     :path => "/tmp/cookbook_a_file_default_tempfile")
+          @cookbook_a_template_default_tempfile = mock("Tempfile for cookbook_a apache.conf.erb template",
+                                                     :path => "/tmp/cookbook_a_template_default_tempfile")
+        end
+  
+        after do
+          Chef::Config[:no_lazy_load] = false
+        end
+  
+        it "fetches templates and cookbook files" do
+          @file_cache.should_receive(:has_key?).
+            with("cookbooks/cookbook_a/files/default/megaman.conf").
+            and_return(false)
+          @file_cache.should_receive(:has_key?).
+            with("cookbooks/cookbook_a/templates/default/apache2.conf.erb").
+            and_return(false)
+
+          @server_api.should_receive(:get_rest).
+            with('http://chef.example.com/megaman.conf', true).
+            and_return(@cookbook_a_file_default_tempfile)
+          @file_cache.should_receive(:move_to).
+            with("/tmp/cookbook_a_file_default_tempfile", "cookbooks/cookbook_a/files/default/megaman.conf")
+          @file_cache.should_receive(:load).
+            with("cookbooks/cookbook_a/files/default/megaman.conf", false).
+            and_return("/file-cache/cookbooks/cookbook_a/default/megaman.conf")
+
+          @server_api.should_receive(:get_rest).
+            with('http://chef.example.com/ffffff', true).
+            and_return(@cookbook_a_template_default_tempfile)
+          @file_cache.should_receive(:move_to).
+            with("/tmp/cookbook_a_template_default_tempfile", "cookbooks/cookbook_a/templates/default/apache2.conf.erb")
+          @file_cache.should_receive(:load).
+            with("cookbooks/cookbook_a/templates/default/apache2.conf.erb", false).
+            and_return("/file-cache/cookbooks/cookbook_a/templates/default/apache2.conf.erb")
+  
+          @synchronizer.sync_cookbooks
+        end
+      end
     end
 
     context "when the cache contains outdated files" do

data/spec/unit/mixin/params_validate_spec.rb

@@ -366,5 +366,40 @@ describe Chef::Mixin::ParamsValidate do
     @vo.set_or_return(:name, value, { }).object_id.should == value.object_id
     @vo.set_or_return(:foo, nil, { :name_attribute => true }).object_id.should == value.object_id
   end
+
+  it "should allow DelayedEvaluator instance to be set for value regardless of restriction" do
+    value = Chef::DelayedEvaluator.new{ 'test' }
+    @vo.set_or_return(:test, value, {:kind_of => Numeric})
+  end
+
+  it "should raise an error when delayed evaluated attribute is not valid" do
+    value = Chef::DelayedEvaluator.new{ 'test' }
+    @vo.set_or_return(:test, value, {:kind_of => Numeric})
+    lambda do
+      @vo.set_or_return(:test, nil, {:kind_of => Numeric})
+    end.should raise_error(Chef::Exceptions::ValidationFailed)
+  end
+
+  it "should create DelayedEvaluator instance when #lazy is used" do
+    @vo.set_or_return(:delayed, @vo.lazy{ 'test' }, {})
+    @vo.instance_variable_get(:@delayed).should be_a(Chef::DelayedEvaluator)
+  end
+
+  it "should execute block on each call when DelayedEvaluator" do
+    value = 'fubar'
+    @vo.set_or_return(:test, @vo.lazy{ value }, {})
+    @vo.set_or_return(:test, nil, {}).should == 'fubar'
+    value = 'foobar'
+    @vo.set_or_return(:test, nil, {}).should == 'foobar'
+    value = 'fauxbar'
+    @vo.set_or_return(:test, nil, {}).should == 'fauxbar'
+  end
+
+  it "should not evaluate non DelayedEvaluator instances" do
+    value = lambda{ 'test' }
+    @vo.set_or_return(:test, value, {})
+    @vo.set_or_return(:test, nil, {}).object_id.should == value.object_id
+    @vo.set_or_return(:test, nil, {}).should be_a(Proc)
+  end
   
 end

data/spec/unit/provider/env_spec.rb

@@ -81,7 +81,7 @@ describe Chef::Provider::Env do
       @provider.action_create
     end
 
-    it "should set the the new_resources updated flag when it creates the key" do
+    it "should set the new_resources updated flag when it creates the key" do
       @provider.action_create
       @new_resource.should be_updated
     end
@@ -99,7 +99,7 @@ describe Chef::Provider::Env do
       @provider.action_create
     end
 
-    it "should set the the new_resources updated flag when it updates an existing value" do
+    it "should set the new_resources updated flag when it updates an existing value" do
       @provider.key_exists = true
       @provider.stub!(:compare_value).and_return(true)
       @provider.stub!(:modify_env).and_return(true)

data/spec/unit/provider/group_spec.rb

@@ -117,7 +117,7 @@ describe Chef::Provider::User do
       @provider.run_action(:create)
     end
   
-    it "should set the the new_resources updated flag when it creates the group" do
+    it "should set the new_resources updated flag when it creates the group" do
       @provider.group_exists = false
       @provider.stub!(:create_group)
       @provider.run_action(:create)
@@ -138,7 +138,7 @@ describe Chef::Provider::User do
       @provider.run_action(:create)
     end
   
-    it "should set the the new_resources updated flag when it creates the group if we call manage_group" do
+    it "should set the new_resources updated flag when it creates the group if we call manage_group" do
       @provider.group_exists = true
       @provider.stub!(:compare_group).and_return(true)
       @provider.stub!(:manage_group).and_return(true)

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

@@ -230,6 +230,50 @@ EOF
         lambda { @provider.candidate_version }.should raise_error(Chef::Exceptions::Package)
       end
 
+      it "should find the candidate_version if a category is specifed and there are category duplicates" do
+        output = <<EOF
+Searching...
+[ Results for search key : git ]
+[ Applications found : 14 ]
+
+*  app-misc/digitemp [ Masked ]
+      Latest version available: 3.5.0
+      Latest version installed: [ Not Installed ]
+      Size of files: 261 kB
+      Homepage:      http://www.digitemp.com/ http://www.ibutton.com/
+      Description:   Temperature logging and reporting using Dallas Semiconductor's iButtons and 1-Wire protocol
+      License:       GPL-2
+
+*  app-misc/git
+      Latest version available: 4.3.20
+      Latest version installed: [ Not Installed ]
+      Size of files: 416 kB
+      Homepage:      http://www.gnu.org/software/git/
+      Description:   GNU Interactive Tools - increase speed and efficiency of most daily task
+      License:       GPL-2
+
+*  dev-util/git
+      Latest version available: 1.6.0.6
+      Latest version installed: ignore
+      Size of files: 2,725 kB
+      Homepage:      http://git.or.cz/
+      Description:   GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
+      License:       GPL-2
+
+*  dev-util/gitosis [ Masked ]
+      Latest version available: 0.2_p20080825
+      Latest version installed: [ Not Installed ]
+      Size of files: 31 kB
+      Homepage:      http://eagain.net/gitweb/?p=gitosis.git;a=summary
+      Description:   gitosis -- software for hosting git repositories
+      License:       GPL-2
+EOF
+
+        @status = mock("Status", :exitstatus => 0)
+        @provider = Chef::Provider::Package::Portage.new(@new_resource, @run_context)
+        @provider.should_receive(:popen4).and_yield(nil, nil, StringIO.new(output), nil).and_return(@status)
+        @provider.candidate_version.should == "1.6.0.6"
+      end
     end
 
     describe Chef::Provider::Package::Portage, "install_package" do

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

@@ -95,6 +95,49 @@ describe Chef::Provider::Package::Rubygems::CurrentGemEnvironment do
     @gem_env.candidate_version_from_remote(Gem::Dependency.new('rspec', '>= 0')).should == Gem::Version.new('1.3.0')
   end
 
+  it "finds a matching gem candidate version on rubygems 2.0.0+" do
+    dep = Gem::Dependency.new('rspec', '>= 0')
+    dep_installer = Gem::DependencyInstaller.new
+    @gem_env.stub!(:dependency_installer).and_return(dep_installer)
+    best_gem = mock("best gem match", :spec => gemspec("rspec", Gem::Version.new("1.3.0")), :source => "https://rubygems.org")
+    available_set = mock("Gem::AvailableSet test double")
+    available_set.should_receive(:pick_best!)
+    available_set.should_receive(:set).and_return([best_gem])
+    dep_installer.should_receive(:find_gems_with_sources).with(dep).and_return(available_set)
+    @gem_env.candidate_version_from_remote(Gem::Dependency.new('rspec', '>= 0')).should == Gem::Version.new('1.3.0')
+  end
+  
+  context "when rubygems was upgraded from 1.8->2.0" do
+    # https://github.com/rubygems/rubygems/issues/404
+    # tl;dr rubygems 1.8 and 2.0 can both be in the load path, which means that
+    # require "rubygems/format" will load even though rubygems 2.0 doesn't have
+    # that file.
+
+    before do
+      if defined?(Gem::Format)
+        # tests are running under rubygems 1.8, or 2.0 upgraded from 1.8
+        @remove_gem_format = false
+      else
+        Gem.const_set(:Format, Object.new)
+        @remove_gem_format = true
+      end
+      Gem::Package.stub!(:respond_to?).with(:open).and_return(false)
+    end
+
+    after do
+      if @remove_gem_format
+        Gem.send(:remove_const, :Format)
+      end
+    end
+
+    it "finds a matching gem candidate version on rubygems 2.0+ with some rubygems 1.8 code loaded" do
+      package = mock("Gem::Package", :spec => "a gemspec from package")
+      Gem::Package.should_receive(:new).with("/path/to/package.gem").and_return(package)
+      @gem_env.spec_from_file("/path/to/package.gem").should == "a gemspec from package"
+    end
+
+  end
+
   it "gives the candidate version as nil if none is found" do
     dep = Gem::Dependency.new('rspec', '>= 0')
     latest = []
@@ -213,7 +256,7 @@ describe Chef::Provider::Package::Rubygems::AlternateGemEnvironment do
   it "determines the installed versions of gems from the source index (part2: the unmockening)" do
     $stdout.stub!(:write)
     path_to_gem = if windows?
-      `where gem`.split[-1]
+      `where gem`.split[1]
     else
       `which gem`.strip
     end

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

@@ -39,7 +39,6 @@ describe Chef::Provider::Package::Yum do
     )
     Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
     @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
-    @stderr = StringIO.new
     @pid = mock("PID")
   end
 
@@ -542,7 +541,7 @@ describe Chef::Provider::Package::Yum do
     it "should call action_upgrade in the parent if the candidate version is nil" do
       @provider.load_current_resource
       @current_resource = Chef::Resource::Package.new('cups')
-      @provider.candidate_version = nil 
+      @provider.candidate_version = nil
       @provider.should_not_receive(:upgrade_package)
       @provider.action_upgrade
     end
@@ -600,7 +599,7 @@ describe Chef::Provider::Package::Yum do
       @provider.stub!(:output_of_command).and_return([@status, "", ""])
       @provider.should_receive(:output_of_command).once.with(
         "yum -d0 -e0 -y install emacs-1.0",
-        {}
+        {:timeout => Chef::Config[:yum_timeout]}
       )
       @provider.yum_command("yum -d0 -e0 -y install emacs-1.0")
     end
@@ -610,7 +609,7 @@ describe Chef::Provider::Package::Yum do
       @provider.stub!(:output_of_command).and_return([@status, "failure failure", "problem problem"])
       @provider.should_receive(:output_of_command).once.with(
         "yum -d0 -e0 -y install emacs-1.0",
-        {}
+        {:timeout => Chef::Config[:yum_timeout]}
       )
       lambda { @provider.yum_command("yum -d0 -e0 -y install emacs-1.0") }.should raise_error(Chef::Exceptions::Exec)
     end
@@ -620,7 +619,7 @@ describe Chef::Provider::Package::Yum do
       @provider.stub!(:output_of_command).and_return([@status, "error: %pre(demo-1-1.el5.centos.x86_64) scriptlet failed, exit status 2", ""])
       @provider.should_receive(:output_of_command).once.with(
         "yum -d0 -e0 -y install emacs-1.0",
-        {}
+        {:timeout => Chef::Config[:yum_timeout]}
       )
       # will still raise an exception, can't stub out the subsequent call
       lambda { @provider.yum_command("yum -d0 -e0 -y install emacs-1.0") }.should raise_error(Chef::Exceptions::Exec)
@@ -631,7 +630,7 @@ describe Chef::Provider::Package::Yum do
       @provider.stub!(:output_of_command).and_return([@status, "error: %post(demo-1-1.el5.centos.x86_64) scriptlet failed, exit status 2", ""])
       @provider.should_receive(:output_of_command).twice.with(
         "yum -d0 -e0 -y install emacs-1.0",
-        {}
+        {:timeout => Chef::Config[:yum_timeout]}
       )
       # will still raise an exception, can't stub out the subsequent call
       lambda { @provider.yum_command("yum -d0 -e0 -y install emacs-1.0") }.should raise_error(Chef::Exceptions::Exec)
@@ -1155,7 +1154,7 @@ describe Chef::Provider::Package::Yum::RPMDbPackage do
 
   describe "repoid" do
     it "should return the source repository repoid" do
-      @rpm_x.repoid.should be == "base" 
+      @rpm_x.repoid.should be == "base"
       @rpm_y.repoid.should be == "extras"
       @rpm_z.repoid.should be == "other"
     end
@@ -1544,7 +1543,10 @@ describe Chef::Provider::Package::Yum::YumCache do
   end
 
   before(:each) do
-    yum_dump_good_output = <<EOF
+    @stdin = mock("STDIN", :nil_object => true)
+    @stdout = mock("STDOUT", :nil_object => true)
+
+    @stdout_good = <<EOF
 [option installonlypkgs] kernel kernel-bigmem kernel-enterprise
 erlang-mochiweb 0 1.4.1 5.el5 x86_64 ['erlang-mochiweb = 1.4.1-5.el5', 'mochiweb = 1.4.1-5.el5'] i installed
 zip 0 2.31 2.el5 x86_64 ['zip = 2.31-2.el5'] r base
@@ -1560,9 +1562,16 @@ znc-extra 0 0.098 1.el5 x86_64 [] a base
 znc-modtcl 0 0.098 1.el5 x86_64 [] a base
 znc-test.beta1 0 0.098 1.el5 x86_64 [] a extras
 znc-test.test.beta1 0 0.098 1.el5 x86_64 [] a base
+EOF
+    @stdout_bad_type = <<EOF
+zip 0 2.31 2.el5 x86_64 ['zip = 2.31-2.el5'] r base
+zlib 0 1.2.3 3 x86_64 ['zlib = 1.2.3-3', 'libz.so.1()(64bit)'] c base
+zlib-devel 0 1.2.3 3 i386 [] a extras
+zlib-devel 0 1.2.3 3 x86_64 ['zlib-devel = 1.2.3-3'] bad installed
+znc-modtcl 0 0.098 1.el5 x86_64 [] a base
 EOF
 
-    yum_dump_bad_output_separators = <<EOF
+    @stdout_bad_separators = <<EOF
 zip 0 2.31 2.el5 x86_64 ['zip = 2.31-2.el5'] r base
 zlib 0 1.2.3 3 x86_64 ['zlib = 1.2.3-3', 'libz.so.1()(64bit)'] i base bad
 zlib-devel 0 1.2.3 3 i386 [] a extras
@@ -1570,36 +1579,20 @@ bad zlib-devel 0 1.2.3 3 x86_64 ['zlib-devel = 1.2.3-3'] i installed
 znc-modtcl 0 0.098 1.el5 x86_64 [] a base bad
 EOF
 
-    yum_dump_bad_output_type = <<EOF
-zip 0 2.31 2.el5 x86_64 ['zip = 2.31-2.el5'] r base
-zlib 0 1.2.3 3 x86_64 ['zlib = 1.2.3-3', 'libz.so.1()(64bit)'] c base
-zlib-devel 0 1.2.3 3 i386 [] a extras
-zlib-devel 0 1.2.3 3 x86_64 ['zlib-devel = 1.2.3-3'] bad installed
-znc-modtcl 0 0.098 1.el5 x86_64 [] a base
-EOF
+    @stdout_no_output = ""
 
-    yum_dump_error = <<EOF
+    @stderr = <<EOF
 yum-dump Config Error: File contains no section headers.
 file: file://///etc/yum.repos.d/CentOS-Base.repo, line: 12
 'qeqwewe\n'
 EOF
-
-    @status = mock("Status", :exitstatus => 0)
-    @status_bad = mock("Status", :exitstatus => 1)
-    @stdin = mock("STDIN", :nil_object => true)
-    @stdout = mock("STDOUT", :nil_object => true)
-    @stdout_good = yum_dump_good_output.split("\n")
-    @stdout_bad_type = yum_dump_bad_output_type.split("\n")
-    @stdout_bad_separators = yum_dump_bad_output_separators.split("\n")
-    @stderr = mock("STDERR", :nil_object => true)
-    @stderr.stub!(:readlines).and_return(yum_dump_error.split("\n"))
-    @pid = mock("PID", :nil_object => true)
+    @status = mock("Status", :exitstatus => 0, :stdin => @stdin, :stdout => @stdout_good, :stderr => @stderr)
 
     # new singleton each time
     Chef::Provider::Package::Yum::YumCache.reset_instance
     @yc = Chef::Provider::Package::Yum::YumCache.instance
     # load valid data
-    @yc.stub!(:popen4).and_yield(@pid, @stdin, @stdout_good, @stderr).and_return(@status)
+    @yc.stub!(:shell_out!).and_return(@status)
   end
 
   describe "initialize" do
@@ -1618,7 +1611,7 @@ EOF
 
   describe "refresh" do
     it "should implicitly call yum-dump.py only once by default after being instantiated" do
-      @yc.should_receive(:popen4).once
+      @yc.should_receive(:shell_out!).once
       @yc.installed_version("zlib")
       @yc.reset
       @yc.installed_version("zlib")
@@ -1626,48 +1619,52 @@ EOF
 
     it "should run yum-dump.py using the system python when next_refresh is for :all" do
       @yc.reload
-      @yc.should_receive(:popen4).with(%r{^/usr/bin/python .*/yum-dump.py --options --installed-provides$}, :waitlast=>true)
+      @yc.should_receive(:shell_out!).with(%r{^/usr/bin/python .*/yum-dump.py --options --installed-provides$}, :timeout=>Chef::Config[:yum_timeout])
       @yc.refresh
     end
 
     it "should run yum-dump.py with the installed flag when next_refresh is for :installed" do
       @yc.reload_installed
-      @yc.should_receive(:popen4).with(%r{^/usr/bin/python .*/yum-dump.py --installed$}, :waitlast=>true)
+      @yc.should_receive(:shell_out!).with(%r{^/usr/bin/python .*/yum-dump.py --installed$}, :timeout=>Chef::Config[:yum_timeout])
       @yc.refresh
     end
 
     it "should run yum-dump.py with the all-provides flag when next_refresh is for :provides" do
       @yc.reload_provides
-      @yc.should_receive(:popen4).with(%r{^/usr/bin/python .*/yum-dump.py --options --all-provides$}, :waitlast=>true)
+      @yc.should_receive(:shell_out!).with(%r{^/usr/bin/python .*/yum-dump.py --options --all-provides$}, :timeout=>Chef::Config[:yum_timeout])
       @yc.refresh
     end
 
     it "should pass extra_repo_control args to yum-dump.py" do
       @yc.enable_extra_repo_control("--enablerepo=foo --disablerepo=bar")
-      @yc.should_receive(:popen4).with(%r{^/usr/bin/python .*/yum-dump.py --options --installed-provides --enablerepo=foo --disablerepo=bar$}, :waitlast=>true)
+      @yc.should_receive(:shell_out!).with(%r{^/usr/bin/python .*/yum-dump.py --options --installed-provides --enablerepo=foo --disablerepo=bar$}, :timeout=>Chef::Config[:yum_timeout])
       @yc.refresh
     end
 
     it "should warn about invalid data with too many separators" do
-      @yc.stub!(:popen4).and_yield(@pid, @stdin, @stdout_bad_separators, @stderr).and_return(@status)
+      @status = mock("Status", :exitstatus => 0, :stdin => @stdin, :stdout => @stdout_bad_separators, :stderr => @stderr)
+      @yc.stub!(:shell_out!).and_return(@status)
       Chef::Log.should_receive(:warn).exactly(3).times.with(%r{Problem parsing})
       @yc.refresh
     end
 
     it "should warn about invalid data with an incorrect type" do
-      @yc.stub!(:popen4).and_yield(@pid, @stdin, @stdout_bad_type, @stderr).and_return(@status)
+      @status = mock("Status", :exitstatus => 0, :stdin => @stdin, :stdout => @stdout_bad_type, :stderr => @stderr)
+      @yc.stub!(:shell_out!).and_return(@status)
       Chef::Log.should_receive(:warn).exactly(2).times.with(%r{Problem parsing})
       @yc.refresh
     end
 
     it "should warn about no output from yum-dump.py" do
-      @yc.stub!(:popen4).and_yield(@pid, @stdin, [], @stderr).and_return(@status)
+      @status = mock("Status", :exitstatus => 0, :stdin => @stdin, :stdout => @stdout_no_output, :stderr => @stderr)
+      @yc.stub!(:shell_out!).and_return(@status)
       Chef::Log.should_receive(:warn).exactly(1).times.with(%r{no output from yum-dump.py})
       @yc.refresh
     end
 
     it "should raise exception yum-dump.py exits with a non zero status" do
-      @yc.stub!(:popen4).and_yield(@pid, @stdin, [], @stderr).and_return(@status_bad)
+      @status = mock("Status", :exitstatus => 1, :stdin => @stdin, :stdout => @stdout_no_output, :stderr => @stderr)
+      @yc.stub!(:shell_out!).and_return(@status)
       lambda { @yc.refresh}.should raise_error(Chef::Exceptions::Package, %r{CentOS-Base.repo, line: 12})
     end
 
@@ -1792,7 +1789,7 @@ EOF
     end
 
     it "should return nil when no match for package-version, no arch" do
-      @yc.package_repository("zisofs-tools", "pretend", nil).should be == nil 
+      @yc.package_repository("zisofs-tools", "pretend", nil).should be == nil
       @yc.package_repository("zisofs-tools", "pretend").should be == nil
       @yc.package_repository("pretend", "1.0.6-3.2.2").should be == nil
     end