Merge pull request redhat-openstack#109 from mhaskel/osx-test-fixes

OSX doesn't support the -e flag to echo.
xbezdick · Jun 12, 2014 · 29ffe09 · 29ffe09
2 parents 1170a53 + 842915d
commit 29ffe09
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/spec/acceptance/ini_setting_spec.rb b/spec/acceptance/ini_setting_spec.rb
@@ -83,7 +83,11 @@
 
     context '=> absent for key/value' do
       before :all do
-        shell("echo -e \"four = five\n[one]\ntwo = three\" > #{tmpdir}/ini_setting.ini")
+        if fact('osfamily') == 'Darwin'
+          shell("echo \"four = five\n[one]\ntwo = three\" > #{tmpdir}/ini_setting.ini")
+        else
+          shell("echo -e \"four = five\n[one]\ntwo = three\" > #{tmpdir}/ini_setting.ini")
+        end
       end
 
       pp = <<-EOS
@@ -111,7 +115,11 @@
 
     context '=> absent for section', :pending => "cannot ensure absent on a section"  do
       before :all do
-        shell("echo -e \"four = five\n[one]\ntwo = three\" > #{tmpdir}/ini_setting.ini")
+        if fact('osfamily') == 'Darwin'
+          shell("echo \"four = five\n[one]\ntwo = three\" > #{tmpdir}/ini_setting.ini")
+        else
+          shell("echo -e \"four = five\n[one]\ntwo = three\" > #{tmpdir}/ini_setting.ini")
+        end
       end
       after :all do
         shell("cat #{tmpdir}/ini_setting.ini", :acceptable_exit_codes => [0,1,2])
@@ -141,7 +149,11 @@
 
     context '=> absent for global' do
       before :all do
-        shell("echo -e \"four = five\n[one]\ntwo = three\" > #{tmpdir}/ini_setting.ini")
+        if fact('osfamily') == 'Darwin'
+          shell("echo \"four = five\n[one]\ntwo = three\" > #{tmpdir}/ini_setting.ini")
+        else
+          shell("echo -e \"four = five\n[one]\ntwo = three\" > #{tmpdir}/ini_setting.ini")
+        end
       end
       after :all do
         shell("cat #{tmpdir}/ini_setting.ini", :acceptable_exit_codes => [0,1,2])

diff --git a/spec/acceptance/ini_subsetting_spec.rb b/spec/acceptance/ini_subsetting_spec.rb
@@ -82,7 +82,11 @@
 
     context 'ensure => absent' do
       before :all do
-        shell("echo -e \"[one]\nkey = alphabet betatrons\" > #{tmpdir}/ini_subsetting.ini")
+        if fact('osfamily') == 'Darwin'
+          shell("echo \"[one]\nkey = alphabet betatrons\" > #{tmpdir}/ini_subsetting.ini")
+        else
+          shell("echo -e \"[one]\nkey = alphabet betatrons\" > #{tmpdir}/ini_subsetting.ini")
+        end
       end
 
       pp = <<-EOS