X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Ffunctions%2Fmax_spec.rb;h=88879d19b99b1aea103113c7c6f81154c6334d8a;hb=131e09855e065be940e104d9ab0f18940cc76257;hp=66fb0c8694034f11cbaa5375a1bbe09c016519d0;hpb=407d322498f4fde815abf381007fbecfe5c10b2b;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/functions/max_spec.rb b/3rdparty/modules/stdlib/spec/functions/max_spec.rb
old mode 100755
new mode 100644
index 66fb0c869..88879d19b
--- a/3rdparty/modules/stdlib/spec/functions/max_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/max_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe 'max' do
+describe 'max', :if => Puppet::Util::Package.versioncmp(Puppet.version, '6.0.0') < 0 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, %r{wrong number of arguments}i) }
   it { is_expected.to run.with_params(1).and_return(1) }
   it { is_expected.to run.with_params(1, 2).and_return(2) }
   it { is_expected.to run.with_params(1, 2, 3).and_return(3) }