chef 11.4.4 → 11.6.0.hotfix.1

data/spec/unit/provider/ifconfig/redhat_spec.rb

@@ -0,0 +1,71 @@
+#
+# Author:: Xabier de Zuazo (xabier@onddo.com)
+# Copyright:: Copyright (c) 2013 Onddo Labs, SL.
+# License:: Apache License, Version 2.0
+#
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+require 'chef/exceptions'
+
+describe Chef::Provider::Ifconfig::Redhat do
+  before do
+    @node = Chef::Node.new
+    @cookbook_collection = Chef::CookbookCollection.new([])
+    @events = Chef::EventDispatch::Dispatcher.new
+    @run_context = Chef::RunContext.new(@node, @cookbook_collection, @events)
+    #This new_resource can be called anything --> it is not the same as in ifconfig.rb
+    @new_resource = Chef::Resource::Ifconfig.new("10.0.0.1", @run_context)
+    @new_resource.mask "255.255.254.0"
+    @new_resource.metric "1"
+    @new_resource.mtu "1500"
+    @new_resource.device "eth0"
+    @provider = Chef::Provider::Ifconfig::Redhat.new(@new_resource, @run_context)
+    @current_resource = Chef::Resource::Ifconfig.new("10.0.0.1", @run_context)
+
+    status = mock("Status", :exitstatus => 0)
+    @provider.instance_variable_set("@status", status)
+    @provider.current_resource = @current_resource
+ end
+
+  describe "generate_config for action_add" do
+
+     it "should write network-script for centos" do
+      @provider.stub!(:load_current_resource)
+      @provider.stub!(:run_command)
+      config_filename = "/etc/sysconfig/network-scripts/ifcfg-#{@new_resource.device}"
+      config_file = StringIO.new
+      File.should_receive(:new).with(config_filename, "w").and_return(config_file)
+
+      @provider.run_action(:add)
+      config_file.string.should match(/^\s*DEVICE=eth0\s*$/)
+      config_file.string.should match(/^\s*IPADDR=10\.0\.0\.1\s*$/)
+      config_file.string.should match(/^\s*NETMASK=255\.255\.254\.0\s*$/)
+     end
+  end
+
+  describe "delete_config for action_delete" do
+
+    it "should delete network-script if it exists for centos" do
+      @current_resource.device @new_resource.device
+      @provider.stub!(:load_current_resource)
+      @provider.stub!(:run_command)
+      config_filename =  "/etc/sysconfig/network-scripts/ifcfg-#{@new_resource.device}"
+      File.should_receive(:exist?).with(config_filename).and_return(true)
+      FileUtils.should_receive(:rm_f).with(config_filename, :verbose => false)
+
+      @provider.run_action(:delete)
+    end
+  end
+end

data/spec/unit/provider/ifconfig_spec.rb

@@ -177,37 +177,4 @@ describe Chef::Provider::Ifconfig do
       @new_resource.should_not be_updated
     end
   end
-  
-  describe Chef::Provider::Ifconfig, "generate_config for action_add" do
-   #%w[ centos redhat fedora ].each do |platform|
-     
-     it "should write network-script for centos" do
-      @provider.stub!(:load_current_resource)
-      @node.automatic_attrs[:platform] = "centos"
-      @provider.stub!(:run_command)
-      config_filename = "/etc/sysconfig/network-scripts/ifcfg-#{@new_resource.device}"
-      config_file = StringIO.new
-      File.should_receive(:new).with(config_filename, "w").and_return(config_file)
-
-      @provider.run_action(:add)
-      config_file.string.should match(/^\s*DEVICE=eth0\s*$/)
-      config_file.string.should match(/^\s*IPADDR=10.0.0.1\s*$/)
-      config_file.string.should match(/^\s*NETMASK=255.255.254.0\s*$/)
-     end
-  end
-
-  describe Chef::Provider::Ifconfig, "delete_config for action_delete" do
-
-    it "should delete network-script if it exists for centos" do
-      @node.automatic_attrs[:platform] = "centos"
-      @current_resource.device "eth0"
-      @provider.stub!(:load_current_resource)
-      @provider.stub!(:run_command)
-      config_filename =  "/etc/sysconfig/network-scripts/ifcfg-#{@new_resource.device}"
-      File.should_receive(:exist?).with(config_filename).and_return(true)
-      FileUtils.should_receive(:rm_f).with(config_filename, :verbose => false)
-
-      @provider.run_action(:delete)
-    end
-  end
 end

data/spec/unit/provider/mount/mount_spec.rb

@@ -108,13 +108,18 @@ describe Chef::Provider::Mount::Mount do
     it "does not expect the device to exist for tmpfs" do
       @new_resource.fstype("tmpfs")
       @new_resource.device("whatever")
-      lambda { @provider.load_current_resource() }.should_not raise_error
+      lambda { @provider.load_current_resource();@provider.mountable? }.should_not raise_error
     end
 
     it "does not expect the device to exist for Fuse filesystems" do
       @new_resource.fstype("fuse")
       @new_resource.device("nilfs#xxx")
-      lambda { @provider.load_current_resource() }.should_not raise_error
+      lambda { @provider.load_current_resource();@provider.mountable? }.should_not raise_error
+    end
+
+    it "does not expect the device to exist if it's none" do
+      @new_resource.device("none")
+      lambda { @provider.load_current_resource();@provider.mountable? }.should_not raise_error
     end
 
     it "should set mounted true if the mount point is found in the mounts list" do
@@ -216,6 +221,32 @@ describe Chef::Provider::Mount::Mount do
       @provider.load_current_resource
       @provider.current_resource.enabled.should be_false
     end
+
+    it "should not mangle the mount options if the device in fstab is a symlink" do
+      target = "/dev/mapper/target"
+      options = "rw,noexec,noauto"
+
+      ::File.stub!(:symlink?).with(@new_resource.device).and_return(true)
+      ::File.stub!(:readlink).with(@new_resource.device).and_return(target)
+
+      fstab = "#{@new_resource.device} #{@new_resource.mount_point} #{@new_resource.fstype} #{options} 1 2\n"
+      ::File.stub!(:foreach).with("/etc/fstab").and_yield fstab
+      @provider.load_current_resource
+      @provider.current_resource.options.should eq(options.split(','))
+    end
+
+    it "should not mangle the mount options if the symlink target is in fstab" do
+      target = "/dev/mapper/target"
+      options = "rw,noexec,noauto"
+
+      ::File.stub!(:symlink?).with(@new_resource.device).and_return(true)
+      ::File.stub!(:readlink).with(@new_resource.device).and_return(target)
+
+      fstab = "#{target} #{@new_resource.mount_point} #{@new_resource.fstype} #{options} 1 2\n"
+      ::File.stub!(:foreach).with("/etc/fstab").and_yield fstab
+      @provider.load_current_resource
+      @provider.current_resource.options.should eq(options.split(','))
+    end
   end
 
   context "after the mount's state has been discovered" do

data/spec/unit/provider/mount/windows_spec.rb

@@ -99,7 +99,10 @@ describe Chef::Provider::Mount::Windows do
       end
 
       it "should mount the filesystem if it is not mounted" do
-        @vol.should_receive(:add).with(@new_resource.device)
+        @vol.should_receive(:add).with(:remote => @new_resource.device,
+                                       :username => @new_resource.username,
+                                       :domainname => @new_resource.domain,
+                                       :password => @new_resource.password)
         @provider.mount_fs
       end
 

data/spec/unit/provider/mount_spec.rb

@@ -51,7 +51,7 @@ describe Chef::Provider::Mount do
 
     it "should not mount the filesystem if it is mounted" do
       @current_resource.stub!(:mounted).and_return(true)
-      @provider.should_not_receive(:mount_fs).and_return(true)
+      @provider.should_not_receive(:mount_fs)
       @provider.run_action(:mount)
       @new_resource.should_not be_updated_by_last_action
     end
@@ -68,7 +68,7 @@ describe Chef::Provider::Mount do
 
     it "should not umount the filesystem if it is not mounted" do
       @current_resource.stub!(:mounted).and_return(false)
-      @provider.should_not_receive(:umount_fs).and_return(true)
+      @provider.should_not_receive(:umount_fs)
       @provider.run_action(:umount)
       @new_resource.should_not be_updated_by_last_action
     end
@@ -108,14 +108,24 @@ describe Chef::Provider::Mount do
   describe "when enabling the filesystem to be mounted" do
     it "should enable the mount if it isn't enable" do
       @current_resource.stub!(:enabled).and_return(false)
-      @provider.should_receive(:enable_fs).with.and_return(true)
+      @provider.should_not_receive(:mount_options_unchanged?)
+      @provider.should_receive(:enable_fs).and_return(true)
       @provider.run_action(:enable)
       @new_resource.should be_updated_by_last_action
     end
 
-    it "should not enable the mount if it is enabled" do
+    it "should enable the mount if it is enabled and mount options have changed" do
       @current_resource.stub!(:enabled).and_return(true)
-      @provider.should_not_receive(:enable_fs).with.and_return(true)
+      @provider.should_receive(:mount_options_unchanged?).and_return(false)
+      @provider.should_receive(:enable_fs).and_return(true)
+      @provider.run_action(:enable)
+      @new_resource.should be_updated_by_last_action
+    end
+
+    it "should not enable the mount if it is enabled and mount options have not changed" do
+      @current_resource.stub!(:enabled).and_return(true)
+      @provider.should_receive(:mount_options_unchanged?).and_return(true)
+      @provider.should_not_receive(:enable_fs).and_return(true)
       @provider.run_action(:enable)
       @new_resource.should_not be_updated_by_last_action
     end
@@ -131,7 +141,7 @@ describe Chef::Provider::Mount do
 
     it "should not disable the mount if it isn't enabled" do
       @current_resource.stub!(:enabled).and_return(false)
-      @provider.should_not_receive(:disable_fs).with.and_return(true)
+      @provider.should_not_receive(:disable_fs)
       @provider.run_action(:disable)
       @new_resource.should_not be_updated_by_last_action
     end

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/smartos_spec.rb

@@ -1,5 +1,6 @@
 #
 # Author:: Trevor O (trevoro@joyent.com)
+# Author:: Yukihiko Sawanobori (sawanoboriyu@higanworks.com)
 # Copyright:: Copyright (c) 2012 Opscode
 # License:: Apache License, Version 2.0
 #
@@ -72,8 +73,8 @@ describe Chef::Provider::Package::SmartOS, "load_current_resource" do
 	
 		it "run pkgin and install the package" do
 			out = OpenStruct.new(:stdout => nil)
-      @provider.should_receive(:shell_out!).with("pkg_info -E \"varnish*\"", {:env => nil, :returns=>[0,1]}).and_return(@shell_out)
-      @provider.should_receive(:shell_out!).with("pkgin -y install varnish-2.1.5nb2", {:env=>nil}).and_return(out)
+      @provider.should_receive(:shell_out!).with("/opt/local/sbin/pkg_info -E \"varnish*\"", {:env => nil, :returns=>[0,1]}).and_return(@shell_out)
+      @provider.should_receive(:shell_out!).with("/opt/local/bin/pkgin -y install varnish-2.1.5nb2", {:env=>nil}).and_return(out)
       @provider.load_current_resource
       @provider.install_package("varnish", "2.1.5nb2")
 		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