X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Facceptance%2Fis_ip_address_spec.rb;h=e528fe5c2bb3433545710b453977c3990adaf69a;hb=6f656bd4265e3dab13b9af2bf96e9044322e9d8f;hp=ed7a85439d236073b5c84af9ceb1942344db8d2d;hpb=ad88f67c13ae0f1a08936dad643f1e3509ab5f40;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/acceptance/is_ip_address_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/is_ip_address_spec.rb
old mode 100755
new mode 100644
index ed7a85439..e528fe5c2
--- a/3rdparty/modules/stdlib/spec/acceptance/is_ip_address_spec.rb
+++ b/3rdparty/modules/stdlib/spec/acceptance/is_ip_address_spec.rb
@@ -1,76 +1,74 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
-describe 'is_ip_address function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
+describe 'is_ip_address function' do
   describe 'success' do
-    it 'is_ip_addresss ipv4' do
-      pp = <<-EOS
+    pp1 = <<-DOC
       $a = '1.2.3.4'
       $b = true
       $o = is_ip_address($a)
       if $o == $b {
         notify { 'output correct': }
       }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
+    DOC
+    it 'is_ip_addresss ipv4' do
+      apply_manifest(pp1, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{Notice: output correct})
       end
     end
-    it 'is_ip_addresss ipv6' do
-      pp = <<-EOS
+
+    pp2 = <<-DOC
       $a = "fe80:0000:cd12:d123:e2f8:47ff:fe09:dd74"
       $b = true
       $o = is_ip_address($a)
       if $o == $b {
         notify { 'output correct': }
       }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
+    DOC
+    it 'is_ip_addresss ipv6' do
+      apply_manifest(pp2, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{Notice: output correct})
       end
     end
-    it 'is_ip_addresss ipv6 compressed' do
-      pp = <<-EOS
+
+    pp3 = <<-DOC
       $a = "fe00::1"
       $b = true
       $o = is_ip_address($a)
       if $o == $b {
         notify { 'output correct': }
       }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
+    DOC
+    it 'is_ip_addresss ipv6 compressed' do
+      apply_manifest(pp3, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{Notice: output correct})
       end
     end
-    it 'is_ip_addresss strings' do
-      pp = <<-EOS
+
+    pp4 = <<-DOC
       $a = "aoeu"
       $b = false
       $o = is_ip_address($a)
       if $o == $b {
         notify { 'output correct': }
       }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
+    DOC
+    it 'is_ip_addresss strings' do
+      apply_manifest(pp4, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{Notice: output correct})
       end
     end
-    it 'is_ip_addresss ipv4 out of range' do
-      pp = <<-EOS
+
+    pp5 = <<-DOC
       $a = '1.2.3.400'
       $b = false
       $o = is_ip_address($a)
       if $o == $b {
         notify { 'output correct': }
       }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
+    DOC
+    it 'is_ip_addresss ipv4 out of range' do
+      apply_manifest(pp5, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{Notice: output correct})
       end
     end
   end