puppet 6.23.0 → 7.0.0

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

@@ -11,7 +11,9 @@ describe Puppet::Type.type(:package).provider(:apt) do
   end
 
   let(:provider) do
-    resource.provider
+    provider = subject()
+    provider.resource = resource
+    provider
   end
 
   it "should be the default provider on :osfamily => Debian" do
@@ -86,7 +88,7 @@ Version table:
 
   describe ".instances" do
     before do
-      allow(Puppet::Type::Package::ProviderDpkg).to receive(:instances).and_return([provider])
+      allow(Puppet::Type::Package::ProviderDpkg).to receive(:instances).and_return([resource])
     end
 
     context "when package is manual marked" do
@@ -95,7 +97,8 @@ Version table:
       end
 
       it 'sets mark to manual' do
-        expect(described_class.instances.map(&:mark)).to eq([:manual])
+        expect(resource).to receive(:mark=).with(:manual)
+        described_class.instances
       end
     end
 
@@ -105,7 +108,8 @@ Version table:
       end
 
       it 'does not set mark to manual' do
-        expect(described_class.instances.map(&:mark)).to eq([nil])
+        expect(resource).not_to receive(:mark=).with(:manual)
+        described_class.instances
       end
     end
   end
@@ -115,12 +119,24 @@ Version table:
       allow(provider).to receive(:dpkgquery).and_return("name: #{resource.name}" )
     end
 
+    context "when package is manual marked" do
+      before do
+        allow(described_class).to receive(:aptmark).with('showmanual').and_return("#{resource.name}\n")
+      end
 
-    context 'when package is not installed on the system' do
-      it 'does not set mark to manual' do
+      it 'sets mark to manual' do
         result = provider.query
+        expect(result[:mark]).to eql(:manual)
+      end
+    end
 
-        expect(described_class).not_to receive(:aptmark)
+    context 'when package is not manual marked ' do
+      before do
+        allow(described_class).to receive(:aptmark).with('showmanual').and_return('')
+      end
+
+      it 'does not set mark to manual' do
+        result = provider.query
         expect(result[:mark]).to be_nil
       end
     end
@@ -277,26 +293,5 @@ Version table:
 
       provider.install
     end
-
-    it "should install using the source attribute if present" do
-      resource[:ensure] = :installed
-      resource[:source] = '/my/local/package/file'
-
-      expect(provider).to receive(:aptget).with(any_args, :install, resource[:source])
-      expect(provider).to receive(:properties).and_return({:mark => :none})
-
-      provider.install
-    end
-
-    it "should install specific version using the source attribute if present" do
-      resource[:ensure] = '1.2.3'
-      resource[:source] = '/my/local/package/file'
-
-      expect(provider).to receive(:aptget).with(any_args, :install, resource[:source])
-      expect(provider).to receive(:properties).and_return({:mark => :none})
-      expect(provider).to receive(:query).and_return({:ensure => '1.2.3'})
-
-      provider.install
-    end
   end
 end

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

@@ -13,7 +13,7 @@ describe Puppet::Type.type(:package).provider(:aptitude) do
 
     before do
       allow(Puppet::Util).to receive(:which).with('/usr/bin/dpkg-query').and_return(dpkgquery_path)
-      allow(described_class).to receive(:aptmark).with('showmanual', 'faff').and_return("")
+      allow(described_class).to receive(:aptmark).with('showmanual').and_return("")
     end
 
     { :absent   => "deinstall ok config-files faff 1.2.3-1\n",

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

@@ -1,18 +1,17 @@
 require 'spec_helper'
 require 'puppet/provider/package'
 
-Puppet::Type.type(:package).provide(:test_base_provider, parent: Puppet::Provider::Package) do
-  def query; end
-end
-
 describe Puppet::Provider::Package do
-  let(:provider) {  Puppet::Type.type(:package).provider(:test_base_provider).new }
-
   it 'returns absent for uninstalled packages when not purgeable' do
+    provider = Puppet::Provider::Package.new
+    expect(provider).to receive(:query).and_return(nil)
+    expect(provider.class).to receive(:feature?).with(:purgeable).and_return(false)
     expect(provider.properties[:ensure]).to eq(:absent)
   end
 
   it 'returns purged for uninstalled packages when purgeable' do
+    provider = Puppet::Provider::Package.new
+    expect(provider).to receive(:query).and_return(nil)
     expect(provider.class).to receive(:feature?).with(:purgeable).and_return(true)
     expect(provider.properties[:ensure]).to eq(:purged)
   end

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

@@ -123,7 +123,7 @@ describe Puppet::Type.type(:package).provider(:dnfmodule) do
         provider.install
       end
 
-      it "should just enable the module if it has no default profile(missing groups or modules)" do
+      it "should just enable the module if it has no default profile" do
         dnf_exception = Puppet::ExecutionFailure.new("Error: Problems in request:\nmissing groups or modules: #{resource[:name]}")
         allow(provider).to receive(:execute).with(array_including('install')).and_raise(dnf_exception)
         resource[:ensure] = :present
@@ -132,15 +132,6 @@ describe Puppet::Type.type(:package).provider(:dnfmodule) do
         provider.install
       end
 
-      it "should just enable the module if it has no default profile(broken groups or modules)" do
-        dnf_exception = Puppet::ExecutionFailure.new("Error: Problems in request:\nbroken groups or modules: #{resource[:name]}")
-        allow(provider).to receive(:execute).with(array_including('install')).and_raise(dnf_exception)
-        resource[:ensure] = :present
-        expect(provider).to receive(:execute).with(array_including('install')).ordered
-        expect(provider).to receive(:execute).with(array_including('enable')).ordered
-        provider.install
-      end
-
       it "should just enable the module if enable_only = true" do
         resource[:ensure] = :present
         resource[:enable_only] = true

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

@@ -392,39 +392,13 @@ describe Puppet::Type.type(:package).provider(:dpkg), unless: Puppet::Util::Plat
       allow(Tempfile).to receive(:open).and_yield(tempfile)
     end
 
-    it "installs first if package is not present and ensure holding" do
-      allow(provider).to receive(:execute)
-      allow(provider).to receive(:package_not_installed?).and_return(true)
-      expect(provider).to receive(:install).once
-      expect(provider).to receive(:hold)
-      provider.deprecated_hold
-    end
-
-    it "skips install new package if hold is true" do
-      allow(provider).to receive(:execute)
-      allow(provider).to receive(:package_not_installed?).and_return(true)
-      expect(provider).to receive(:install).once
-      expect(provider).to receive(:hold)
-      provider.deprecated_hold
-    end
-
-    it "skips install new package if package is allready installed" do
-      allow(provider).to receive(:execute)
-      allow(provider).to receive(:package_not_installed?).and_return(false)
-      expect(provider).not_to receive(:install)
-      expect(provider).to receive(:hold)
-      provider.deprecated_hold
-    end
-
     it "executes dpkg --set-selections when holding" do
-      allow(provider).to receive(:package_not_installed?).and_return(false)
       allow(provider).to receive(:install)
       expect(provider).to receive(:execute).with([:dpkg, '--set-selections'], {:failonfail => false, :combine => false, :stdinfile => tempfile.path}).once
       provider.hold
     end
 
     it "executes dpkg --set-selections when unholding" do
-      allow(provider).to receive(:package_not_installed?).and_return(false)
       allow(provider).to receive(:install)
       expect(provider).to receive(:execute).with([:dpkg, '--set-selections'], {:failonfail => false, :combine => false, :stdinfile => tempfile.path}).once
       provider.hold
@@ -467,26 +441,4 @@ describe Puppet::Type.type(:package).provider(:dpkg), unless: Puppet::Util::Plat
     provider.purge
   end
 
-  context "package_not_installed?" do
-    context "allow_virtual false" do
-        before do
-          allow(resource).to receive(:allow_virtual?).and_return(false)
-        end
-
-      it "returns true if package is not found" do
-        expect(provider).to receive(:dpkgquery).with("-W", "--showformat", "'${Status} ${Package} ${Version}\\n'", resource_name).and_raise(Puppet::ExecutionFailure.new("eh"))
-        expect(provider.package_not_installed?).to eq(true)
-      end
-
-      it "returns true if package is not installed" do
-        expect(provider).to receive(:dpkgquery).with("-W", "--showformat", "'${Status} ${Package} ${Version}\\n'", resource_name).and_return("unknown ok not-installed #{resource_name}")
-        expect(provider.package_not_installed?).to eq(true)
-      end
-
-      it "returns false if package is installed" do
-        expect(provider).to receive(:dpkgquery).with("-W", "--showformat", "'${Status} ${Package} ${Version}\\n'", resource_name).and_return("install ok installed resource_name 1.2.3")
-        expect(provider.package_not_installed?).to eq(false)
-      end
-    end
-  end
 end

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

@@ -12,6 +12,10 @@ context Puppet::Type.type(:package).provider(:gem) do
   let(:provider_gem_cmd) { '/provider/gem' }
   let(:execute_options) { {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}} }
 
+  before do
+    allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
+  end
+
   context 'installing myresource' do
     let(:resource) do
       Puppet::Type.type(:package).new(
@@ -36,6 +40,34 @@ context Puppet::Type.type(:package).provider(:gem) do
         allow(provider).to receive(:rubygem_version).and_return('1.9.9')
       end
 
+      context 'on windows' do
+        let(:path) do
+          "C:\\Program Files\\Puppet Labs\\Puppet\\puppet\\bin;C:\\Program Files\\Puppet Labs\\Puppet\\bin;C:\\Ruby26-x64\\bin;C:\\Windows\\system32\\bin"
+        end
+
+        let(:expected_path) do
+          "C:\\Program Files\\Puppet Labs\\Puppet\\bin;C:\\Ruby26-x64\\bin;C:\\Windows\\system32\\bin"
+        end
+
+        before do
+          allow(Puppet::Util::Platform).to receive(:windows?).and_return(true)
+          allow(Puppet::Util).to receive(:get_env)
+          allow(Puppet::Util).to receive(:get_env).with('PATH').and_return(path)
+          allow(described_class).to receive(:validate_command).with(provider_gem_cmd)
+          stub_const('::File::PATH_SEPARATOR', ';')
+        end
+
+        it 'removes puppet/bin from PATH' do
+          expect(described_class).to receive(:execute) \
+            .with(
+              anything,
+              hash_including(custom_environment: hash_including(PATH: expected_path))
+            )
+            .and_return("")
+          provider.install
+        end
+      end
+
       it "should use the path to the gem command" do
         allow(described_class).to receive(:validate_command).with(provider_gem_cmd)
         expect(described_class).to receive(:execute).with(be_a(Array), execute_options) { |args| expect(args[0]).to eq(provider_gem_cmd) }.and_return("")

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

@@ -191,27 +191,6 @@ OUTPUT
           expect(versions[version]).to eq(:rpm)
         end
       end
-
-      it "should be able to parse RPM package listings with letters in version" do
-        showres_output = <<END
-cairo                                                              ALL  @@R:cairo _all_filesets
-   @@R:cairo-1.14.6-2waixX11 1.14.6-2waixX11
-END
-        packages = subject.send(:parse_showres_output, showres_output)
-        expect(Set.new(packages.keys)).to eq(Set.new(['cairo']))
-        versions = packages['cairo']
-        expect(versions.has_key?('1.14.6-2waixX11')).to eq(true)
-        expect(versions['1.14.6-2waixX11']).to eq(:rpm)
-      end
-
-      it "should raise error when parsing invalid RPM package listings" do
-              showres_output = <<END
-cairo                                                              ALL  @@R:cairo _all_filesets
-   @@R:cairo-invalid_version invalid_version
-END
-        expect{ subject.send(:parse_showres_output, showres_output) }.to raise_error(Puppet::Error,
-          /Unable to parse output from nimclient showres: package string does not match expected rpm package string format/)
-      end
     end
 
     context "#determine_latest_version" do
@@ -241,27 +220,6 @@ END
       it "should return :installp for installp/bff packages" do
         expect(subject.send(:determine_package_type, bff_showres_output, 'mypackage.foo', '1.2.3.4')).to eq(:installp)
       end
-
-      it "should return :installp for security updates" do
-        nimclient_showres_output = <<END
-bos.net                                                            ALL  @@S:bos.net _all_filesets
- + 7.2.0.1  TCP/IP ntp Applications                                     @@S:bos.net.tcp.ntp 7.2.0.1
- + 7.2.0.2  TCP/IP ntp Applications                                     @@S:bos.net.tcp.ntp 7.2.0.2
-
-END
-        expect(subject.send(:determine_package_type, nimclient_showres_output, 'bos.net.tcp.ntp', '7.2.0.2')).to eq(:installp)
-      end
-
-      it "should raise error when invalid header format is given" do
-        nimclient_showres_output = <<END
-bos.net                                                            ALL  @@INVALID_TYPE:bos.net _all_filesets
- + 7.2.0.1  TCP/IP ntp Applications                                     @@INVALID_TYPE:bos.net.tcp.ntp 7.2.0.1
- + 7.2.0.2  TCP/IP ntp Applications                                     @@INVALID_TYPE:bos.net.tcp.ntp 7.2.0.2
-
-END
-        expect{ subject.send(:determine_package_type, nimclient_showres_output, 'bos.net.tcp.ntp', '7.2.0.2') }.to raise_error(
-          Puppet::Error, /Unable to parse output from nimclient showres: line does not match expected package header format/)
-      end
     end
   end
 end

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

@@ -32,12 +32,10 @@ describe Puppet::Type.type(:package).provider(:pacman) do
     end
 
     it "should call yaourt to install the right package quietly when yaourt is installed" do
-      without_partial_double_verification do
-        allow(described_class).to receive(:yaourt?).and_return(true)
-        args = ['--noconfirm', '--needed', '--noprogressbar', '-S', resource[:name]]
-        expect(provider).to receive(:yaourt).at_least(:once).with(*args).and_return('')
-        provider.install
-      end
+      allow(described_class).to receive(:yaourt?).and_return(true)
+      args = ['--noconfirm', '--needed', '--noprogressbar', '-S', resource[:name]]
+      expect(provider).to receive(:yaourt).at_least(:once).with(*args).and_return('')
+      provider.install
     end
 
     it "should raise an Puppet::Error if the installation failed" do
@@ -76,12 +74,10 @@ describe Puppet::Type.type(:package).provider(:pacman) do
       end
 
       it "should call yaourt to install the right package quietly when yaourt is installed" do
-        without_partial_double_verification do
-          expect(described_class).to receive(:yaourt?).and_return(true)
-          args = ['--noconfirm', '--needed', '--noprogressbar', '-x', '--arg=value', '-S', resource[:name]]
-          expect(provider).to receive(:yaourt).at_least(:once).with(*args).and_return('')
-          provider.install
-        end
+        expect(described_class).to receive(:yaourt?).and_return(true)
+        args = ['--noconfirm', '--needed', '--noprogressbar', '-x', '--arg=value', '-S', resource[:name]]
+        expect(provider).to receive(:yaourt).at_least(:once).with(*args).and_return('')
+        provider.install
       end
     end
 
@@ -176,12 +172,10 @@ describe Puppet::Type.type(:package).provider(:pacman) do
     end
 
     it "should call yaourt to remove the right package quietly" do
-      without_partial_double_verification do
-        allow(described_class).to receive(:yaourt?).and_return(true)
-        args = ["--noconfirm", "--noprogressbar", "-R", resource[:name]]
-        expect(provider).to receive(:yaourt).with(*args)
-        provider.uninstall
-      end
+      allow(described_class).to receive(:yaourt?).and_return(true)
+      args = ["--noconfirm", "--noprogressbar", "-R", resource[:name]]
+      expect(provider).to receive(:yaourt).with(*args)
+      provider.uninstall
     end
 
     it "adds any uninstall_options" do

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

@@ -14,8 +14,9 @@ describe Puppet::Type.type(:package).provider(:pip) do
   it { is_expected.to be_version_ranges }
 
   before do
-    @resource = Puppet::Type.type(:package).new(name: "fake_package", provider: :pip)
-    @provider = @resource.provider
+    @resource = Puppet::Resource.new(:package, "fake_package")
+    allow(@resource).to receive(:original_parameters).and_return({})
+    @provider = described_class.new(@resource)
     @client = double('client')
     allow(@client).to receive(:call).with('package_releases', 'real_package').and_return(["1.3", "1.2.5", "1.2.4"])
     allow(@client).to receive(:call).with('package_releases', 'fake_package').and_return([])
@@ -334,6 +335,7 @@ describe Puppet::Type.type(:package).provider(:pip) do
 
     it "should install" do
       @resource[:ensure] = :installed
+      @resource[:source] = nil
       expect(@provider).to receive(:execute).with(["/fake/bin/pip", ["install", "-q", "fake_package"]])
       @provider.install
     end
@@ -366,6 +368,7 @@ describe Puppet::Type.type(:package).provider(:pip) do
 
     it "should install a particular version" do
       @resource[:ensure] = "0.0.0"
+      @resource[:source] = nil
       # TJK
       expect(@provider).to receive(:execute).with(["/fake/bin/pip", ["install", "-q", "fake_package==0.0.0"]])
       @provider.install
@@ -373,6 +376,7 @@ describe Puppet::Type.type(:package).provider(:pip) do
 
     it "should upgrade" do
       @resource[:ensure] = :latest
+      @resource[:source] = nil
       # TJK
       expect(@provider).to receive(:execute).with(["/fake/bin/pip", ["install", "-q", "--upgrade", "fake_package"]])
       @provider.install
@@ -380,6 +384,7 @@ describe Puppet::Type.type(:package).provider(:pip) do
 
     it "should handle install options" do
       @resource[:ensure] = :installed
+      @resource[:source] = nil
       @resource[:install_options] = [{"--timeout" => "10"}, "--no-index"]
       expect(@provider).to receive(:execute).with(["/fake/bin/pip", ["install", "-q", "--timeout=10", "--no-index", "fake_package"]])
       @provider.install
@@ -410,7 +415,7 @@ describe Puppet::Type.type(:package).provider(:pip) do
     let(:pip) { '/fake/bin/pip' }
 
     it "should look up version if pip is present" do
-      allow(described_class).to receive(:cmd).and_return(pip)
+      allow(described_class).to receive(:pip_cmd).and_return(pip)
       process = ['pip 8.0.2 from /usr/local/lib/python2.7/dist-packages (python 2.7)']
       allow(described_class).to receive(:execpipe).with([pip, '--version']).and_yield(process)
 
@@ -418,7 +423,7 @@ describe Puppet::Type.type(:package).provider(:pip) do
     end
 
     it "parses multiple lines of output" do
-      allow(described_class).to receive(:cmd).and_return(pip)
+      allow(described_class).to receive(:pip_cmd).and_return(pip)
       process = [
         "/usr/local/lib/python2.7/dist-packages/urllib3/contrib/socks.py:37: DependencyWarning: SOCKS support in urllib3 requires the installation of optional dependencies: specifically, PySocks. For more information, see https://urllib3.readthedocs.io/en/latest/contrib.html#socks-proxies",
         "  DependencyWarning",
@@ -430,7 +435,7 @@ describe Puppet::Type.type(:package).provider(:pip) do
     end
 
     it "raises if there isn't a version string" do
-      allow(described_class).to receive(:cmd).and_return(pip)
+      allow(described_class).to receive(:pip_cmd).and_return(pip)
       allow(described_class).to receive(:execpipe).with([pip, '--version']).and_yield([""])
       expect {
         described_class.pip_version(pip)
@@ -439,7 +444,7 @@ describe Puppet::Type.type(:package).provider(:pip) do
 
     it "quotes commands with spaces" do
       pip = 'C:\Program Files\Python27\Scripts\pip.exe'
-      allow(described_class).to receive(:cmd).and_return(pip)
+      allow(described_class).to receive(:pip_cmd).and_return(pip)
       process = ["pip 18.1 from c:\program files\python27\lib\site-packages\pip (python 2.7)\r\n"]
       allow(described_class).to receive(:execpipe).with(["\"#{pip}\"", '--version']).and_yield(process)