Merge pull request #8772 from joshcooper/main_pkg_exitstatus

(maint) Return ProcessOutput instead of using CHILD_STATUS

Author: joshcooper

spec/unit/provider/package/pkg_spec.rb

@@ -414,16 +414,17 @@ def self.it_should_respond_to(*actions)
               .and_return(Puppet::Util::Execution::ProcessOutput.new('', 0))
             provider.insync?(is)
           end
-          
+
           it "should try 5 times to install and fail when all tries failed" do
             allow_any_instance_of(Kernel).to receive(:sleep)
-              
+
             expect(provider).to receive(:query).and_return({:ensure => :absent})
             expect(provider).to receive(:properties).and_return({:mark => :hold})
             expect(provider).to receive(:unhold)
             expect(Puppet::Util::Execution).to receive(:execute)
-              .with(['/bin/pkg', 'install', *hash[:flags], 'dummy'], {:failonfail => false, :combine => true}).exactly(5).times
-            allow($CHILD_STATUS).to receive(:exitstatus).and_return(7)
+              .with(['/bin/pkg', 'install', *hash[:flags], 'dummy'], {:failonfail => false, :combine => true})
+              .and_return(Puppet::Util::Execution::ProcessOutput.new('', 7))
+              .exactly(5).times
             expect {
               provider.update
             }.to raise_error(Puppet::Error, /Pkg could not install dummy after 5 tries. Aborting run/)