Merge pull request redhat-openstack#82 from hunner/grep_sol10

Avoid multi-line grep on Solaris 10
xbezdick · Feb 27, 2014 · 698e632 · 698e632
2 parents 5ec46f6 + 49433d0
commit 698e632
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/spec/acceptance/ini_setting_spec.rb b/spec/acceptance/ini_setting_spec.rb
@@ -21,7 +21,10 @@
 
     describe file(path) do
       it { should be_file }
-      it { should contain(content) }
+      #XXX Solaris 10 doesn't support multi-line grep
+      it("should contain #{content}", :unless => fact('operatingsystemrelease').match(/^10_u\d+$/) {
+        should contain(content)
+      }
     end
   end
 
@@ -69,7 +72,10 @@
 
       describe file('/tmp/ini_setting.ini') do
         it { should be_file }
-        it { should contain("four = five\n[one]\ntwo = three") }
+        #XXX Solaris 10 doesn't support multi-line grep
+        it("should contain four = five\n[one]\ntwo = three", :unless => fact('operatingsystemrelease').match(/^10_u\d+$/) {
+          should contain("four = five\n[one]\ntwo = three")
+        }
       end
     end
 

diff --git a/spec/acceptance/ini_subsetting_spec.rb b/spec/acceptance/ini_subsetting_spec.rb
@@ -71,7 +71,10 @@
 
       describe file('/tmp/ini_subsetting.ini') do
         it { should be_file }
-        it { should contain("[one]\nkey = alphabet betatrons") }
+        #XXX Solaris 10 doesn't support multi-line grep
+        it("should contain [one]\nkey = alphabet betatrons", :unless => fact('operatingsystemrelease').match(/^10_u\d+$/) {
+          should contain("[one]\nkey = alphabet betatrons")
+        }
       end
     end