X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Ffunctions%2Fis_ip_address_spec.rb;h=86f3cf8920d38915d1544ca3ec03ef3063c284bf;hb=30caaa85aed7015ca0d77216bff175eebd917eb7;hp=39525d7ac35ba43a3b985783b0052b363dfcb157;hpb=6963202b4b62c2816655ac9532521b018fdf83bd;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/functions/is_ip_address_spec.rb b/3rdparty/modules/stdlib/spec/functions/is_ip_address_spec.rb
old mode 100755
new mode 100644
index 39525d7ac..86f3cf892
--- a/3rdparty/modules/stdlib/spec/functions/is_ip_address_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/is_ip_address_spec.rb
@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe 'is_ip_address' do
   it { is_expected.not_to eq(nil) }
-  it { is_expected.to run.with_params().and_raise_error(Puppet::ParseError, /wrong number of arguments/i) }
-  it { is_expected.to run.with_params([], []).and_raise_error(Puppet::ParseError, /wrong number of arguments/i) }
+  it { is_expected.to run.with_params.and_raise_error(Puppet::ParseError, %r{wrong number of arguments}i) }
+  it { is_expected.to run.with_params([], []).and_raise_error(Puppet::ParseError, %r{wrong number of arguments}i) }
   it { is_expected.to run.with_params('1.2.3.4').and_return(true) }
   it { is_expected.to run.with_params('1.2.3.255').and_return(true) }
   it { is_expected.to run.with_params('1.2.3.256').and_return(false) }
@@ -20,21 +20,5 @@ describe 'is_ip_address' do
   it { is_expected.to run.with_params(1).and_return(false) }
   it { is_expected.to run.with_params({}).and_return(false) }
   it { is_expected.to run.with_params([]).and_return(false) }
-
-  context 'Checking for deprecation warning', if: Puppet.version.to_f < 4.0 do
-    # Checking for deprecation warning, which should only be provoked when the env variable for it is set.
-    it 'should display a single deprecation' do
-      ENV['STDLIB_LOG_DEPRECATIONS'] = "true"
-      scope.expects(:warning).with(includes('This method is deprecated'))
-      is_expected.to run.with_params('1.2.3.4').and_return(true)
-    end
-    it 'should display no warning for deprecation' do
-      ENV['STDLIB_LOG_DEPRECATIONS'] = "false"
-      scope.expects(:warning).with(includes('This method is deprecated')).never
-      is_expected.to run.with_params('1.2.3.4').and_return(true)
-    end
-    after(:all) do 
-      ENV.delete('STDLIB_LOG_DEPRECATIONS')
-    end
-  end
+  it { is_expected.to run.with_params('thisstring').and_return(false) }
 end