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

diff --git a/3rdparty/modules/stdlib/spec/functions/validate_augeas_spec.rb b/3rdparty/modules/stdlib/spec/functions/validate_augeas_spec.rb
old mode 100755
new mode 100644
index 4236649d6..2dd0df897
--- a/3rdparty/modules/stdlib/spec/functions/validate_augeas_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/validate_augeas_spec.rb
@@ -1,21 +1,19 @@
 require 'spec_helper'
 
 describe 'validate_augeas' do
-  unless Puppet.features.augeas?
-    skip "ruby-augeas not installed"
-  else
+  if Puppet.features.augeas?
     describe 'signature validation' 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('', '', [], '', 'extra').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('', '', [], '', 'extra').and_raise_error(Puppet::ParseError, %r{wrong number of arguments}i) }
       it { is_expected.to run.with_params('one', 'one', 'MSG to User', '4th arg').and_raise_error(NoMethodError) }
     end
 
     describe 'valid inputs' do
       inputs = [
-        [ "root:x:0:0:root:/root:/bin/bash\n", 'Passwd.lns' ],
-        [ "proc /proc   proc    nodev,noexec,nosuid     0       0\n", 'Fstab.lns'],
+        ["root:x:0:0:root:/root:/bin/bash\n", 'Passwd.lns'],
+        ["proc /proc   proc    nodev,noexec,nosuid     0       0\n", 'Fstab.lns'],
       ]
 
       inputs.each do |input|
@@ -28,32 +26,32 @@ describe 'validate_augeas' do
       # don't specify an error message to display.  This is the behvior in
       # 2.2.x and prior.
       inputs = [
-        [ "root:x:0:0:root\n", 'Passwd.lns' ],
-        [ "127.0.1.1\n", 'Hosts.lns' ],
+        ["root:x:0:0:root\n", 'Passwd.lns'],
+        ["127.0.1.1\n", 'Hosts.lns'],
       ]
 
       inputs.each do |input|
-        it { is_expected.to run.with_params(*input).and_raise_error(Puppet::ParseError, /validate_augeas.*?matched less than it should/) }
+        it { is_expected.to run.with_params(*input).and_raise_error(Puppet::ParseError, %r{validate_augeas.*?matched less than it should}) }
       end
     end
 
-    describe "when specifying nice error messages" do
+    describe 'when specifying nice error messages' do
       # The intent here is to make sure the function returns the 4th argument
       # in the exception thrown
       inputs = [
-        [ "root:x:0:0:root\n", 'Passwd.lns', [], 'Failed to validate passwd content' ],
-        [ "127.0.1.1\n", 'Hosts.lns', [], 'Wrong hosts content' ],
+        ["root:x:0:0:root\n", 'Passwd.lns', [], 'Failed to validate passwd content'],
+        ["127.0.1.1\n", 'Hosts.lns', [], 'Wrong hosts content'],
       ]
 
       inputs.each do |input|
-        it { is_expected.to run.with_params(*input).and_raise_error(Puppet::ParseError, /#{input[3]}/) }
+        it { is_expected.to run.with_params(*input).and_raise_error(Puppet::ParseError, %r{#{input[3]}}) }
       end
     end
 
-    describe "matching additional tests" do
+    describe 'matching additional tests' do
       inputs = [
-        [ "root:x:0:0:root:/root:/bin/bash\n", 'Passwd.lns', ['$file/foobar']],
-        [ "root:x:0:0:root:/root:/bin/bash\n", 'Passwd.lns', ['$file/root/shell[.="/bin/sh"]', 'foobar']],
+        ["root:x:0:0:root:/root:/bin/bash\n", 'Passwd.lns', ['$file/foobar']],
+        ["root:x:0:0:root:/root:/bin/bash\n", 'Passwd.lns', ['$file/root/shell[.="/bin/sh"]', 'foobar']],
       ]
 
       inputs.each do |input|
@@ -61,15 +59,17 @@ describe 'validate_augeas' do
       end
     end
 
-    describe "failing additional tests" do
+    describe 'failing additional tests' do
       inputs = [
-        [ "foobar:x:0:0:root:/root:/bin/bash\n", 'Passwd.lns', ['$file/foobar']],
-        [ "root:x:0:0:root:/root:/bin/sh\n", 'Passwd.lns', ['$file/root/shell[.="/bin/sh"]', 'foobar']],
+        ["foobar:x:0:0:root:/root:/bin/bash\n", 'Passwd.lns', ['$file/foobar']],
+        ["root:x:0:0:root:/root:/bin/sh\n", 'Passwd.lns', ['$file/root/shell[.="/bin/sh"]', 'foobar']],
       ]
 
       inputs.each do |input|
-        it { is_expected.to run.with_params(*input).and_raise_error(Puppet::ParseError, /testing path/) }
+        it { is_expected.to run.with_params(*input).and_raise_error(Puppet::ParseError, %r{testing path}) }
       end
     end
+  else
+    skip 'ruby-augeas not installed'
   end
 end