(PUP-10597) Remove deprecated held

Author: Dorin-Pleava

acceptance/tests/provider/package/dpkg_ensure_held_package_is_latest.rb

@@ -173,14 +173,10 @@ def purge
     dpkg "--purge", @resource[:name]
   end
 
-  def deprecated_hold
+  def hold
     if package_not_installed?
       self.install
     end
-    hold
-  end
-
-  def hold
     Tempfile.open('puppet_dpkg_set_selection') do |tmpfile|
       tmpfile.write("#{@resource[:name]} hold\n")
       tmpfile.flush

acceptance/tests/provider/package/dpkg_ensure_held_package_should_preserve_version.rb

@@ -114,10 +114,6 @@ def self.parse_line(line)
     end).merge({:provider => self.name})
   end
 
-  def deprecated_hold
-    hold
-  end
-
   def hold
     pkg(:freeze, @resource[:name])
   end

lib/puppet/provider/package/dpkg.rb

@@ -112,7 +112,7 @@ def qatom
       # do the search
       should = @resource[:ensure]
       case should
-      # The terms present, absent, purged, held, installed, latest in :ensure 
+      # The terms present, absent, purged, installed, latest in :ensure
       # resolve as Symbols, and we do not need specific package version in this case
       when true, false, Symbol
         search = @resource[:name]

lib/puppet/provider/package/pkg.rb

@@ -106,10 +106,6 @@ module Puppet
         provider.purge
       end
 
-      newvalue(:held, :event => :package_held, :required_features => :holdable) do
-        provider.deprecated_hold
-      end
-
       newvalue(:disabled, :required_features => :disableable) do
         provider.disable
       end
@@ -673,7 +669,7 @@ def refresh
         Default is "none". Mark can be specified with or without `ensure`,
         if `ensure` is missing will default to "present".
 
-        Mark cannot be specified together with "purged", "absent" or "held"
+        Mark cannot be specified together with "purged", or "absent"
         values for `ensure`.
       EOT
       newvalues(:hold, :none)

lib/puppet/provider/package/portage.rb

@@ -381,24 +381,21 @@ def parser_test(dpkg_output_string, gold_hash, number_of_debug_logs = 0)
       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
+      provider.hold
     end
 
-    it "skips install new package if hold is true" do
+    it "install new package if hold is true and package not installed" 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
+      provider.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
+      provider.hold
     end
 
     it "executes dpkg --set-selections when holding" do

lib/puppet/type/package.rb

@@ -349,7 +349,7 @@ def setprops(properties)
         end
       end
 
-      [:purged, :absent, :held].each do |state|
+      [:purged, :absent].each do |state|
         it "should not reinstall if it should be #{state.to_s} and reinstall_on_refresh is true" do
           @package[:ensure] = state
           allow(@provider).to receive(:reinstallable?).and_return(true)