Merge pull request #657 from HelenCampbell/dupRemoval

Remove duplicate deprecation warnings

4 files changed, 6 insertions, 6 deletions

diff --git a/lib/puppet/parser/functions/validate_absolute_path.rb b/lib/puppet/parser/functions/validate_absolute_path.rb
index d5f5443..15b5c57 100644
--- a/lib/puppet/parser/functions/validate_absolute_path.rb
+++ b/lib/puppet/parser/functions/validate_absolute_path.rb
@@ -26,7 +26,8 @@ module Puppet::Parser::Functions
 
     ENDHEREDOC
 
-    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Absolute_path. There is further documentation for validate_legacy function in the README.'])
+    # The deprecation function was being called twice, as validate_absolute_path calls is_absolute_path. I have removed it from here so it only calls deprecation once within is_absolute_path.
+    # function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Absolute_path. There is further documentation for validate_legacy function in the README.'])
 
     require 'puppet/util'
 
diff --git a/lib/puppet/parser/functions/validate_bool.rb b/lib/puppet/parser/functions/validate_bool.rb
index 4e52ffd..e4345eb 100644
--- a/lib/puppet/parser/functions/validate_bool.rb
+++ b/lib/puppet/parser/functions/validate_bool.rb
@@ -19,7 +19,8 @@ module Puppet::Parser::Functions
 
     ENDHEREDOC
 
-    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Bool. There is further documentation for validate_legacy function in the README.'])
+    # The deprecation function was being called twice, as validate_bool calls is_bool. I have removed it from here so it only calls deprecation once within is_bool.
+    # function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Bool. There is further documentation for validate_legacy function in the README.'])
 
     unless args.length > 0 then
       raise Puppet::ParseError, ("validate_bool(): wrong number of arguments (#{args.length}; must be > 0)")
diff --git a/spec/functions/validate_absolute_path_spec.rb b/spec/functions/validate_absolute_path_spec.rb
index 75df6bc..bdb55f0 100755
--- a/spec/functions/validate_absolute_path_spec.rb
+++ b/spec/functions/validate_absolute_path_spec.rb
@@ -7,9 +7,8 @@ describe 'validate_absolute_path' do
 
   # Checking for deprecation warning
   it 'should display a single deprecation' do
-    # called twice because validate_absolute_path calls is_absolute_path
     ENV['STDLIB_LOG_DEPRECATIONS'] = "true"
-    scope.expects(:warning).with(includes('This method is deprecated')).twice
+    scope.expects(:warning).with(includes('This method is deprecated'))
     is_expected.to run.with_params('c:/')
   end
 
diff --git a/spec/functions/validate_bool_spec.rb b/spec/functions/validate_bool_spec.rb
index 4bd1453..8b7e438 100755
--- a/spec/functions/validate_bool_spec.rb
+++ b/spec/functions/validate_bool_spec.rb
@@ -7,9 +7,8 @@ describe 'validate_bool' do
 
   # Checking for deprecation warning
   it 'should display a single deprecation' do
-    #called twice, because validate_bool calls is_bool
     ENV['STDLIB_LOG_DEPRECATIONS'] = "true"
-    scope.expects(:warning).with(includes('This method is deprecated')).twice
+    scope.expects(:warning).with(includes('This method is deprecated'))
     is_expected.to run.with_params(true)
   end