puppet 5.0.0 → 6.0.0

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

@@ -6,7 +6,7 @@ require 'spec_helper'
 provider_class = Puppet::Type.type(:package).provider(:dnf)
 
 context 'default' do
-  [ 19, 20, 21 ].each do |ver|
+  (19..21).each do |ver|
     it "should not be the default provider on fedora#{ver}" do
       Facter.stubs(:value).with(:osfamily).returns(:redhat)
       Facter.stubs(:value).with(:operatingsystem).returns(:fedora)
@@ -15,7 +15,7 @@ context 'default' do
     end
   end
 
-  [ 22, 23, 24 ].each do |ver|
+  (22..26).each do |ver|
     it "should be the default provider on fedora#{ver}" do
       Facter.stubs(:value).with(:osfamily).returns(:redhat)
       Facter.stubs(:value).with(:operatingsystem).returns(:fedora)
@@ -23,6 +23,13 @@ context 'default' do
       expect(provider_class).to be_default
     end
   end
+
+  it "should be the default provider on some random future fedora" do
+    Facter.stubs(:value).with(:osfamily).returns(:redhat)
+    Facter.stubs(:value).with(:operatingsystem).returns(:fedora)
+    Facter.stubs(:value).with(:operatingsystemmajrelease).returns("8675")
+    expect(provider_class).to be_default
+  end
 end
 
 describe provider_class do

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

@@ -68,7 +68,7 @@ describe provider_class do
     end
 
     def dpkg_query_execution_returns(output)
-      Puppet::Util::Execution.expects(:execute).with(query_args, execute_options).returns(output)
+      Puppet::Util::Execution.expects(:execute).with(query_args, execute_options).returns(Puppet::Util::Execution::ProcessOutput.new(output, 0))
     end
 
     before do
@@ -221,7 +221,7 @@ describe provider_class do
 
     before do
       tempfile.stubs(:write)
-      Tempfile.stubs(:new).returns tempfile
+      Tempfile.stubs(:open).yields tempfile
     end
 
     it "installs first if holding" do

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

@@ -56,7 +56,7 @@ context 'installing myresource' do
 
       it "should allow setting an install_options parameter" do
         resource[:install_options] = [ '--force', {'--bindir' => '/usr/bin' } ]
-        provider.expects(:execute).with { |args| args[5] == '--force' && args[6] == '--bindir=/usr/bin' }.returns ''
+        provider.expects(:execute).with { |args| args[2] == '--force' && args[3] == '--bindir=/usr/bin' }.returns ''
         provider.install
       end
 
@@ -88,7 +88,7 @@ context 'installing myresource' do
             provider.install
           end
         end
-        describe "as a windows path on windows", :if => Puppet.features.microsoft_windows? do
+        describe "as a windows path on windows", :if => Puppet::Util::Platform.windows? do
           it "should treat the source as a local path" do
             resource[:source] = "c:/this/is/a/path/to/a/gem.gem"
             provider.expects(:execute).with { |args| args[2] == "c:/this/is/a/path/to/a/gem.gem" }.returns ""
@@ -137,12 +137,12 @@ context 'installing myresource' do
       end
 
       it "should return an empty array when no gems installed" do
-        provider_class.expects(:execute).with(%w{/my/gem list --local}).returns("\n")
+        provider_class.expects(:execute).with(%w{/my/gem list --local}, {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}}).returns("\n")
         expect(provider_class.instances).to eq([])
       end
 
       it "should return ensure values as an array of installed versions" do
-        provider_class.expects(:execute).with(%w{/my/gem list --local}).returns <<-HEREDOC.gsub(/        /, '')
+        provider_class.expects(:execute).with(%w{/my/gem list --local}, {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}}).returns <<-HEREDOC.gsub(/        /, '')
         systemu (1.2.0)
         vagrant (0.8.7, 0.6.9)
         HEREDOC
@@ -154,7 +154,7 @@ context 'installing myresource' do
       end
 
       it "should ignore platform specifications" do
-        provider_class.expects(:execute).with(%w{/my/gem list --local}).returns <<-HEREDOC.gsub(/        /, '')
+        provider_class.expects(:execute).with(%w{/my/gem list --local}, {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}}).returns <<-HEREDOC.gsub(/        /, '')
         systemu (1.2.0)
         nokogiri (1.6.1 ruby java x86-mingw32 x86-mswin32-60, 1.4.4.1 x86-mswin32)
         HEREDOC
@@ -165,8 +165,18 @@ context 'installing myresource' do
         ])
       end
 
+      it "should not list 'default: ' text from rubygems''" do
+        provider_class.expects(:execute).with(%w{/my/gem list --local}, anything).returns <<-HEREDOC.gsub(/        /, '')
+        bundler (1.16.1, default: 1.16.0, 1.15.1)
+        HEREDOC
+
+        expect(provider_class.instances.map {|p| p.properties}).to eq([
+          {:name => 'bundler', :ensure => ["1.16.1", "1.16.0", "1.15.1"], :provider => :gem}
+        ])
+      end
+
       it "should not fail when an unmatched line is returned" do
-        provider_class.expects(:execute).with(%w{/my/gem list --local}).
+        provider_class.expects(:execute).with(%w{/my/gem list --local}, {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}}).
           returns(File.read(my_fixture('line-with-1.8.5-warning')))
 
         expect(provider_class.instances.map {|p| p.properties}).
@@ -186,7 +196,7 @@ context 'installing myresource' do
     describe "listing gems" do
       describe "searching for a single package" do
         it "searches for an exact match" do
-          provider_class.expects(:execute).with(includes('^bundler$')).returns(File.read(my_fixture('gem-list-single-package')))
+          provider_class.expects(:execute).with(includes('\Abundler\z'), {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}}).returns(File.read(my_fixture('gem-list-single-package')))
           expected = {:name => 'bundler', :ensure => %w[1.6.2], :provider => :gem}
           expect(provider_class.gemlist({:justme => 'bundler'})).to eq(expected)
         end

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

@@ -27,7 +27,7 @@ describe provider_class do
   end
 
   let(:bff_showres_output) {
-    <<END
+    Puppet::Util::Execution::ProcessOutput.new(<<END, 0)
 mypackage.foo                                                           ALL  @@I:mypackage.foo _all_filesets
  @ 1.2.3.1  MyPackage Runtime Environment                       @@I:mypackage.foo 1.2.3.1
  + 1.2.3.4  MyPackage Runtime Environment                       @@I:mypackage.foo 1.2.3.4
@@ -37,7 +37,7 @@ END
   }
 
   let(:rpm_showres_output) {
-    <<END
+    Puppet::Util::Execution::ProcessOutput.new(<<END, 0)
 mypackage.foo                                                                ALL  @@R:mypackage.foo _all_filesets
  @@R:mypackage.foo-1.2.3-1 1.2.3-1
  @@R:mypackage.foo-1.2.3-4 1.2.3-4
@@ -168,9 +168,6 @@ OUTPUT
 
       expect { @provider.install }.to raise_error(Puppet::Error, "NIM package provider is unable to downgrade packages")
     end
-
-
-
   end
 
   context "when uninstalling" do
@@ -187,10 +184,8 @@ OUTPUT
       @provider.class.expects(:pkglist).with(:pkgname => 'mypackage.foo').returns(nil)
       @provider.uninstall
     end
-
   end
 
-
   context "when parsing nimclient showres output" do
     describe "#parse_showres_output" do
       it "should be able to parse installp/BFF package listings" do
@@ -231,7 +226,6 @@ END
           expect(subject.send(:determine_latest_version, nimclient_showres_output, 'mypackage.foo')).to eq([:rpm, nil])
         end
       end
-
     end
 
     describe "#determine_package_type" do
@@ -244,7 +238,4 @@ END
       end
     end
   end
-
-
-
 end

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

@@ -74,7 +74,7 @@ describe Puppet::Type.type(:package).provider(:opkg) do
         end
 
         it "should install from the path segment of the URL" do
-          Puppet::Util::Execution.expects(:execute).returns("")
+          Puppet::Util::Execution.expects(:execute).returns(Puppet::Util::Execution::ProcessOutput.new("", 0))
           provider.install
         end
       end
@@ -165,7 +165,7 @@ OPKG_OUTPUT
     end
 
     it "should return a nil if the package isn't found" do
-      Puppet::Util::Execution.expects(:execute).returns("")
+      Puppet::Util::Execution.expects(:execute).returns(Puppet::Util::Execution::ProcessOutput.new("", 0))
       expect(provider.query).to be_nil
     end
 

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

@@ -2,10 +2,9 @@
 require 'spec_helper'
 
 provider_class = Puppet::Type.type(:package).provider(:pip)
-osfamilies = { ['All', nil] => ['pip', 'pip-python'] }
+osfamilies = { 'windows' => ['pip.exe'], 'other' => ['pip', 'pip-python'] }
 
 describe provider_class do
-
   before do
     @resource = Puppet::Resource.new(:package, "fake_package")
     @provider = provider_class.new(@resource)
@@ -15,7 +14,6 @@ describe provider_class do
   end
 
   describe "parse" do
-
     it "should return a hash on valid input" do
       expect(provider_class.parse("real_package==1.2.5")).to eq({
         :ensure   => "1.2.5",
@@ -27,28 +25,29 @@ describe provider_class do
     it "should return nil on invalid input" do
       expect(provider_class.parse("foo")).to eq(nil)
     end
-
   end
 
   describe "cmd" do
-    it "should return pip-python on legacy systems" do
-      Facter.stubs(:value).with(:osfamily).returns("legacy")
+    it "should return 'pip.exe' by default on Windows systems" do
+      Puppet::Util::Platform.stubs(:windows?).returns true
+      expect(provider_class.cmd[0]).to eq('pip.exe')
+    end
+
+    it "could return pip-python on legacy redhat systems which rename pip" do
+      Puppet::Util::Platform.stubs(:windows?).returns false
       expect(provider_class.cmd[1]).to eq('pip-python')
     end
 
-    it "should return pip by default" do
-      Facter.stubs(:value).with(:osfamily).returns("All")
+    it "should return pip by default on other systems" do
+      Puppet::Util::Platform.stubs(:windows?).returns false
       expect(provider_class.cmd[0]).to eq('pip')
     end
-
   end
 
   describe "instances" do
-
     osfamilies.each do |osfamily, pip_cmds|
-      it "should return an array on #{osfamily} when #{pip_cmds.join(' or ')} is present" do
-        Facter.stubs(:value).with(:osfamily).returns(osfamily.first)
-        Facter.stubs(:value).with(:operatingsystemmajrelease).returns(osfamily.last)
+      it "should return an array on #{osfamily} systems when #{pip_cmds.join(' or ')} is present" do
+        Puppet::Util::Platform.stubs(:windows?).returns (osfamily == 'windows')
         pip_cmds.each do |pip_cmd|
           pip_cmds.each do |cmd|
             unless cmd == pip_cmd
@@ -59,25 +58,37 @@ describe provider_class do
           provider_class.expects(:which).with(pip_cmd).returns("/fake/bin/#{pip_cmd}")
           p = stub("process")
           p.expects(:collect).yields("real_package==1.2.5")
-          provider_class.expects(:execpipe).with("/fake/bin/#{pip_cmd} freeze").yields(p)
+          provider_class.expects(:execpipe).with(["/fake/bin/#{pip_cmd}", "freeze"]).yields(p)
           provider_class.instances
         end
       end
 
-      it "should return an empty array on #{osfamily} when #{pip_cmds.join(' and ')} are missing" do
-        Facter.stubs(:value).with(:osfamily).returns(osfamily.first)
-        Facter.stubs(:value).with(:operatingsystemmajrelease).returns(osfamily.last)
+      context "with pip version >= 8.1.0" do
+        versions = ['8.1.0', '9.0.1']
+        versions.each do |version|
+          it "should use the --all option when version is '#{version}'" do
+            Puppet::Util::Platform.stubs(:windows?).returns (osfamily == 'windows')
+            provider_class.stubs(:pip_cmd).returns('/fake/bin/pip')
+            provider_class.stubs(:pip_version).returns(version)
+            p = stub("process")
+            p.expects(:collect).yields("real_package==1.2.5")
+            provider_class.expects(:execpipe).with(["/fake/bin/pip", "freeze", "--all"]).yields(p)
+            provider_class.instances
+          end
+        end
+      end
+
+      it "should return an empty array on #{osfamily} systems when #{pip_cmds.join(' and ')} are missing" do
+        Puppet::Util::Platform.stubs(:windows?).returns (osfamily == 'windows')
         pip_cmds.each do |cmd|
           provider_class.expects(:which).with(cmd).returns nil
         end
         expect(provider_class.instances).to eq([])
       end
     end
-
   end
 
   describe "query" do
-
     before do
       @resource[:name] = "real_package"
     end
@@ -125,6 +136,7 @@ describe provider_class do
         provider_class.stubs(:pip_version).returns('1.0.1')
         provider_class.stubs(:which).with('pip').returns("/fake/bin/pip")
         provider_class.stubs(:which).with('pip-python').returns("/fake/bin/pip")
+        provider_class.stubs(:which).with('pip.exe').returns("/fake/bin/pip")
       end
 
       it "should find a version number for new_pip_package" do
@@ -181,6 +193,7 @@ describe provider_class do
         provider_class.stubs(:pip_version).returns('1.5.4')
         provider_class.stubs(:which).with('pip').returns("/fake/bin/pip")
         provider_class.stubs(:which).with('pip-python').returns("/fake/bin/pip")
+        provider_class.stubs(:which).with('pip.exe').returns("/fake/bin/pip")
       end
 
       it "should find a version number for real_package" do
@@ -224,11 +237,9 @@ describe provider_class do
         expect(latest).to eq('15.0.2')
       end
     end
-
   end
 
   describe "install" do
-
     before do
       @resource[:name] = "fake_package"
       @url = "git+https://example.com/fake_package.git"
@@ -291,31 +302,25 @@ describe provider_class do
         with("install", "-q", "--timeout=10", "--no-index", "fake_package")
       @provider.install
     end
-
   end
 
   describe "uninstall" do
-
     it "should uninstall" do
       @resource[:name] = "fake_package"
       @provider.expects(:lazy_pip).
         with('uninstall', '-y', '-q', 'fake_package')
       @provider.uninstall
     end
-
   end
 
   describe "update" do
-
     it "should just call install" do
       @provider.expects(:install).returns(nil)
       @provider.update
     end
-
   end
 
   describe "pip_version" do
-
     it "should return nil on missing pip" do
       provider_class.stubs(:pip_cmd).returns(nil)
       expect(provider_class.pip_version).to eq(nil)
@@ -328,11 +333,9 @@ describe provider_class do
       provider_class.expects(:execpipe).with(['/fake/bin/pip', '--version']).yields(p)
       expect(provider_class.pip_version).to eq('8.0.2')
     end
-
   end
 
   describe "lazy_pip" do
-
     after(:each) do
       Puppet::Type::Package::ProviderPip.instance_variable_set(:@confine_collection, nil)
     end
@@ -344,9 +347,8 @@ describe provider_class do
 
     osfamilies.each do |osfamily, pip_cmds|
       pip_cmds.each do |pip_cmd|
-        it "should retry on #{osfamily} if #{pip_cmd} has not yet been found" do
-          Facter.stubs(:value).with(:osfamily).returns(osfamily.first)
-          Facter.stubs(:value).with(:operatingsystemmajrelease).returns(osfamily.last)
+        it "should retry on #{osfamily} systems if #{pip_cmd} has not yet been found" do
+          Puppet::Util::Platform.stubs(:windows?).returns (osfamily == 'windows')
           @provider.expects(:pip).twice.with('freeze').raises(NoMethodError).then.returns(nil)
           pip_cmds.each do |cmd|
             unless cmd == pip_cmd
@@ -358,9 +360,8 @@ describe provider_class do
         end
       end
 
-      it "should fail on #{osfamily} if #{pip_cmds.join(' and ')} are missing" do
-        Facter.stubs(:value).with(:osfamily).returns(osfamily.first)
-        Facter.stubs(:value).with(:operatingsystemmajrelease).returns(osfamily.last)
+      it "should fail on #{osfamily} systems if #{pip_cmds.join(' and ')} are missing" do
+        Puppet::Util::Platform.stubs(:windows?).returns (osfamily == 'windows')
         @provider.expects(:pip).with('freeze').raises(NoMethodError)
         pip_cmds.each do |pip_cmd|
           @provider.expects(:which).with(pip_cmd).returns(nil)
@@ -368,9 +369,8 @@ describe provider_class do
         expect { @provider.method(:lazy_pip).call("freeze") }.to raise_error(NoMethodError)
       end
 
-      it "should output a useful error message on #{osfamily} if #{pip_cmds.join(' and ')} are missing" do
-        Facter.stubs(:value).with(:osfamily).returns(osfamily.first)
-        Facter.stubs(:value).with(:operatingsystemmajrelease).returns(osfamily.last)
+      it "should output a useful error message on #{osfamily} systems if #{pip_cmds.join(' and ')} are missing" do
+        Puppet::Util::Platform.stubs(:windows?).returns (osfamily == 'windows')
         @provider.expects(:pip).with('freeze').raises(NoMethodError)
         pip_cmds.each do |pip_cmd|
           @provider.expects(:which).with(pip_cmd).returns(nil)
@@ -378,9 +378,6 @@ describe provider_class do
         expect { @provider.method(:lazy_pip).call("freeze") }.
           to raise_error(NoMethodError, "Could not locate command #{pip_cmds.join(' and ')}.")
       end
-
     end
-
   end
-
 end

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

@@ -1,16 +1,18 @@
 #! /usr/bin/env ruby
 require 'spec_helper'
 
-describe Puppet::Type.type(:package).provider(:pkg) do
+describe Puppet::Type.type(:package).provider(:pkg), unless: Puppet::Util::Platform.jruby? do
   let (:resource) { Puppet::Resource.new(:package, 'dummy', :parameters => {:name => 'dummy', :ensure => :latest}) }
   let (:provider) { described_class.new(resource) }
 
-  if Puppet.features.microsoft_windows?
-    # Get a pid for $CHILD_STATUS to latch on to
-    command = "cmd.exe /c \"exit 0\""
-    Puppet::Util::Execution.execute(command, {:failonfail => false})
-  else
-    Puppet::Util::Execution.execute('exit 0', {:failonfail => false})
+  before(:all) do
+    if Puppet::Util::Platform.windows?
+      # Get a pid for $CHILD_STATUS to latch on to
+      command = "cmd.exe /c \"exit 0\""
+      Puppet::Util::Execution.execute(command, {:failonfail => false})
+    else
+      Puppet::Util::Execution.execute('exit 0', {:failonfail => false})
+    end
   end
 
   before :each do
@@ -101,6 +103,9 @@ describe Puppet::Type.type(:package).provider(:pkg) do
     end
 
     context ":latest" do
+      before do
+        described_class.expects(:pkg).with(:refresh)
+      end
       it "should work correctly for ensure latest on solaris 11 (UFOXI) when there are no further packages to install" do
         described_class.expects(:pkg).with(:list,'-Hvn','dummy').returns File.read(my_fixture('dummy_solaris11.installed'))
         expect(provider.latest).to eq('1.0.6,5.11-0.175.0.0.0.2.537:20131230T130000Z')
@@ -112,7 +117,9 @@ describe Puppet::Type.type(:package).provider(:pkg) do
       end
 
       it "should work correctly for ensure latest on solaris 11(known UFOXI)" do
-        Puppet::Util::Execution.expects(:execute).with(['/bin/pkg', 'update', '-n', 'dummy'], {:failonfail => false, :combine => true}).returns ''
+        Puppet::Util::Execution.expects(:execute)
+          .with(['/bin/pkg', 'update', '-n', 'dummy'], {:failonfail => false, :combine => true})
+          .returns(Puppet::Util::Execution::ProcessOutput.new('', 0))
         $CHILD_STATUS.stubs(:exitstatus).returns 0
 
         described_class.expects(:pkg).with(:list,'-Hvn','dummy').returns File.read(my_fixture('dummy_solaris11.known'))
@@ -177,7 +184,9 @@ describe Puppet::Type.type(:package).provider(:pkg) do
     context ":query" do
       context "on solaris 10" do
         it "should find the package" do
-          Puppet::Util::Execution.expects(:execute).with(['/bin/pkg', 'list', '-Hv', 'dummy'], {:failonfail => false, :combine => true}).returns File.read(my_fixture('dummy_solaris10'))
+          Puppet::Util::Execution.expects(:execute)
+            .with(['/bin/pkg', 'list', '-Hv', 'dummy'], {:failonfail => false, :combine => true})
+            .returns(Puppet::Util::Execution::ProcessOutput.new(File.read(my_fixture('dummy_solaris10')), 0))
           $CHILD_STATUS.stubs(:exitstatus).returns 0
           expect(provider.query).to eq({
             :name      => 'dummy',
@@ -189,7 +198,9 @@ describe Puppet::Type.type(:package).provider(:pkg) do
         end
 
         it "should return :absent when the package is not found" do
-          Puppet::Util::Execution.expects(:execute).with(['/bin/pkg', 'list', '-Hv', 'dummy'], {:failonfail => false, :combine => true}).returns ''
+          Puppet::Util::Execution.expects(:execute)
+            .with(['/bin/pkg', 'list', '-Hv', 'dummy'], {:failonfail => false, :combine => true})
+            .returns(Puppet::Util::Execution::ProcessOutput.new('', 0))
           $CHILD_STATUS.stubs(:exitstatus).returns 1
           expect(provider.query).to eq({:ensure => :absent, :name => "dummy"})
         end
@@ -198,7 +209,9 @@ describe Puppet::Type.type(:package).provider(:pkg) do
       context "on solaris 11" do
         it "should find the package" do
           $CHILD_STATUS.stubs(:exitstatus).returns 0
-          Puppet::Util::Execution.expects(:execute).with(['/bin/pkg', 'list', '-Hv', 'dummy'], {:failonfail => false, :combine => true}).returns File.read(my_fixture('dummy_solaris11.installed'))
+          Puppet::Util::Execution.expects(:execute)
+            .with(['/bin/pkg', 'list', '-Hv', 'dummy'], {:failonfail => false, :combine => true})
+            .returns(Puppet::Util::Execution::ProcessOutput.new(File.read(my_fixture('dummy_solaris11.installed')), 0))
           expect(provider.query).to eq({
             :name      => 'dummy',
             :status    => 'installed',
@@ -209,14 +222,19 @@ describe Puppet::Type.type(:package).provider(:pkg) do
         end
 
         it "should return :absent when the package is not found" do
-          Puppet::Util::Execution.expects(:execute).with(['/bin/pkg', 'list', '-Hv', 'dummy'], {:failonfail => false, :combine => true}).returns ''
+          Puppet::Util::Execution
+            .expects(:execute)
+            .with(['/bin/pkg', 'list', '-Hv', 'dummy'], {:failonfail => false, :combine => true})
+            .returns(Puppet::Util::Execution::ProcessOutput.new('', 0))
           $CHILD_STATUS.stubs(:exitstatus).returns 1
           expect(provider.query).to eq({:ensure => :absent, :name => "dummy"})
         end
       end
 
       it "should return fail when the packageline cannot be parsed" do
-        Puppet::Util::Execution.expects(:execute).with(['/bin/pkg', 'list', '-Hv', 'dummy'], {:failonfail => false, :combine => true}).returns(File.read(my_fixture('incomplete')))
+        Puppet::Util::Execution.expects(:execute)
+          .with(['/bin/pkg', 'list', '-Hv', 'dummy'], {:failonfail => false, :combine => true})
+          .returns(Puppet::Util::Execution::ProcessOutput.new(File.read(my_fixture('incomplete')), 0))
         $CHILD_STATUS.stubs(:exitstatus).returns 0
         expect {
           provider.query
@@ -235,8 +253,12 @@ describe Puppet::Type.type(:package).provider(:pkg) do
           end
           it "should accept all licenses" do
             provider.expects(:query).with().returns({:ensure => :absent})
-            Puppet::Util::Execution.expects(:execute).with(['/bin/pkg', 'install', *hash[:flags], 'dummy'], {:failonfail => false, :combine => true}).returns ''
-            Puppet::Util::Execution.expects(:execute).with(['/bin/pkg', 'unfreeze', 'dummy'], {:failonfail => false, :combine => true}).returns ''
+            Puppet::Util::Execution.expects(:execute)
+              .with(['/bin/pkg', 'install', *hash[:flags], 'dummy'], {:failonfail => false, :combine => true})
+              .returns(Puppet::Util::Execution::ProcessOutput.new('', 0))
+            Puppet::Util::Execution.expects(:execute)
+              .with(['/bin/pkg', 'unfreeze', 'dummy'], {:failonfail => false, :combine => true})
+              .returns(Puppet::Util::Execution::ProcessOutput.new('', 0))
             $CHILD_STATUS.stubs(:exitstatus).returns 0
             provider.install
           end
@@ -246,16 +268,24 @@ describe Puppet::Type.type(:package).provider(:pkg) do
             resource[:ensure] = '0.0.7,5.11-0.151006:20131230T130000Z'
             $CHILD_STATUS.stubs(:exitstatus).returns 0
             Puppet::Util::Execution.expects(:execute).with(['/bin/pkg', 'unfreeze', 'dummy'], {:failonfail => false, :combine => true})
-            Puppet::Util::Execution.expects(:execute).with(['/bin/pkg', 'list', '-Hv', 'dummy'], {:failonfail => false, :combine => true}).returns 'pkg://foo/dummy@0.0.6,5.11-0.151006:20131230T130000Z  installed -----'
-            Puppet::Util::Execution.expects(:execute).with(['/bin/pkg', 'update', *hash[:flags], 'dummy@0.0.7,5.11-0.151006:20131230T130000Z'], {:failonfail => false, :combine => true}).returns ''
+            Puppet::Util::Execution.expects(:execute)
+              .with(['/bin/pkg', 'list', '-Hv', 'dummy'], {:failonfail => false, :combine => true})
+              .returns(Puppet::Util::Execution::ProcessOutput.new('pkg://foo/dummy@0.0.6,5.11-0.151006:20131230T130000Z  installed -----', 0))
+            Puppet::Util::Execution.expects(:execute)
+              .with(['/bin/pkg', 'update', *hash[:flags], 'dummy@0.0.7,5.11-0.151006:20131230T130000Z'], {:failonfail => false, :combine => true})
+              .returns(Puppet::Util::Execution::ProcessOutput.new('', 0))
             provider.install
           end
 
           it "should install specific version(2)" do
             resource[:ensure] = '0.0.8'
             Puppet::Util::Execution.expects(:execute).with(['/bin/pkg', 'unfreeze', 'dummy'], {:failonfail => false, :combine => true})
-            Puppet::Util::Execution.expects(:execute).with(['/bin/pkg', 'list', '-Hv', 'dummy'], {:failonfail => false, :combine => true}).returns 'pkg://foo/dummy@0.0.7,5.11-0.151006:20131230T130000Z  installed -----'
-            Puppet::Util::Execution.expects(:execute).with(['/bin/pkg', 'update', *hash[:flags], 'dummy@0.0.8'], {:failonfail => false, :combine => true}).returns ''
+            Puppet::Util::Execution.expects(:execute)
+              .with(['/bin/pkg', 'list', '-Hv', 'dummy'], {:failonfail => false, :combine => true})
+              .returns(Puppet::Util::Execution::ProcessOutput.new('pkg://foo/dummy@0.0.7,5.11-0.151006:20131230T130000Z  installed -----', 0))
+            Puppet::Util::Execution.expects(:execute)
+              .with(['/bin/pkg', 'update', *hash[:flags], 'dummy@0.0.8'], {:failonfail => false, :combine => true})
+              .returns(Puppet::Util::Execution::ProcessOutput.new('', 0))
             $CHILD_STATUS.stubs(:exitstatus).returns 0
             provider.install
           end
@@ -265,14 +295,18 @@ describe Puppet::Type.type(:package).provider(:pkg) do
             provider.expects(:query).with().returns({:ensure => '0.0.8,5.11-0.151106:20131230T130000Z'})
             $CHILD_STATUS.stubs(:exitstatus).returns 0
             Puppet::Util::Execution.expects(:execute).with(['/bin/pkg', 'unfreeze', 'dummy'], {:failonfail => false, :combine => true})
-            Puppet::Util::Execution.expects(:execute).with(['/bin/pkg', 'update', *hash[:flags], 'dummy@0.0.7'], {:failonfail => false, :combine => true}).returns ''
+            Puppet::Util::Execution.expects(:execute)
+              .with(['/bin/pkg', 'update', *hash[:flags], 'dummy@0.0.7'], {:failonfail => false, :combine => true})
+              .returns(Puppet::Util::Execution::ProcessOutput.new('', 0))
             provider.install
           end
 
           it "should install any if version is not specified" do
             resource[:ensure] = :present
             provider.expects(:query).with().returns({:ensure => :absent})
-            Puppet::Util::Execution.expects(:execute).with(['/bin/pkg', 'install', *hash[:flags], 'dummy'], {:failonfail => false, :combine => true}).returns ''
+            Puppet::Util::Execution.expects(:execute)
+              .with(['/bin/pkg', 'install', *hash[:flags], 'dummy'], {:failonfail => false, :combine => true})
+              .returns(Puppet::Util::Execution::ProcessOutput.new('', 0))
             Puppet::Util::Execution.expects(:execute).with(['/bin/pkg', 'unfreeze', 'dummy'], {:failonfail => false, :combine => true})
             $CHILD_STATUS.stubs(:exitstatus).returns 0
             provider.install
@@ -282,7 +316,9 @@ describe Puppet::Type.type(:package).provider(:pkg) do
             resource[:ensure] = '0.0.7'
             provider.expects(:query).with().returns({:ensure => :absent})
             Puppet::Util::Execution.expects(:execute).with(['/bin/pkg', 'unfreeze', 'dummy'], {:failonfail => false, :combine => true})
-            Puppet::Util::Execution.expects(:execute).with(['/bin/pkg', 'install', *hash[:flags], 'dummy@0.0.7'], {:failonfail => false, :combine => true}).returns ''
+            Puppet::Util::Execution.expects(:execute)
+              .with(['/bin/pkg', 'install', *hash[:flags], 'dummy@0.0.7'], {:failonfail => false, :combine => true})
+              .returns(Puppet::Util::Execution::ProcessOutput.new('', 0))
             $CHILD_STATUS.stubs(:exitstatus).returns 0
             provider.install
           end
@@ -291,7 +327,9 @@ describe Puppet::Type.type(:package).provider(:pkg) do
             resource[:ensure] = '1.0-0.151006'
             is = :absent
             provider.expects(:query).with().returns({:ensure => is})
-            described_class.expects(:pkg).with(:list, '-Hvfa', 'dummy@1.0-0.151006').returns File.read(my_fixture('dummy_implicit_version'))
+            described_class.expects(:pkg)
+              .with(:list, '-Hvfa', 'dummy@1.0-0.151006')
+              .returns(Puppet::Util::Execution::ProcessOutput.new(File.read(my_fixture('dummy_implicit_version')), 0))
             Puppet::Util::Execution.expects(:execute).with(['/bin/pkg', 'install', '-n', 'dummy@1.0,5.11-0.151006:20140220T084443Z'], {:failonfail => false, :combine => true})
             provider.expects(:unhold).with()
             Puppet::Util::Execution.expects(:execute).with(['/bin/pkg', 'install', *hash[:flags], 'dummy@1.0,5.11-0.151006:20140220T084443Z'], {:failonfail => false, :combine => true})
@@ -317,7 +355,9 @@ describe Puppet::Type.type(:package).provider(:pkg) do
             resource[:ensure] = '1.0-0.151006'
             is = '1.0,5.11-0.151006:20140220T084443Z'
             provider.expects(:warning).with("Implicit version 1.0-0.151006 has 3 possible matches")
-            described_class.expects(:pkg).with(:list, '-Hvfa', 'dummy@1.0-0.151006').returns File.read(my_fixture('dummy_implicit_version'))
+            described_class.expects(:pkg)
+              .with(:list, '-Hvfa', 'dummy@1.0-0.151006')
+              .returns(Puppet::Util::Execution::ProcessOutput.new(File.read(my_fixture('dummy_implicit_version')), 0))
             Puppet::Util::Execution.expects(:execute).with(['/bin/pkg', 'update', '-n', 'dummy@1.0,5.11-0.151006:20140220T084443Z'], {:failonfail => false, :combine => true})
             $CHILD_STATUS.stubs(:exitstatus).returns 4
             provider.insync?(is)

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

@@ -56,7 +56,7 @@ describe provider_class do
 
     it "should return all packages when invoked" do
       expect(provider_class.instances.map(&:name).sort).to eq(
-        %w{ca_root_nss curl nmap pkg gnupg mcollective zsh tac_plus}.sort)
+        %w{ca_root_nss curl nmap pkg gnupg zsh tac_plus}.sort)
     end
 
     it "should set latest to current version when no upgrade available" do

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

@@ -17,7 +17,7 @@ describe provider_class do
     provider
   end
 
-  if Puppet.features.microsoft_windows?
+  if Puppet::Util::Platform.windows?
     let(:puppet_gem) { 'gem' }
   else
     let(:puppet_gem) { '/opt/puppetlabs/puppet/bin/gem' }
@@ -41,7 +41,7 @@ describe provider_class do
 
     it "should allow setting an install_options parameter" do
       resource[:install_options] = [ '--force', {'--bindir' => '/usr/bin' } ]
-      provider.expects(:execute).with { |args| args[5] == '--force' && args[6] == '--bindir=/usr/bin' }.returns ''
+      provider.expects(:execute).with { |args| args[2] == '--force' && args[3] == '--bindir=/usr/bin' }.returns ''
       provider.install
     end
   end