Merge pull request #145 from hunner/fix_beaker_tests

Update specs and fix FM-1361

1 files changed, 5 insertions, 5 deletions

diff --git a/spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb b/spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb
index 0c86c77..43c3f2e 100644
--- a/spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb
+++ b/spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb
@@ -26,13 +26,13 @@ hosts.each do |host|
   end
 
   step 'setup - create group' do
-    apply_manifest_on(host, "group { '#{group}': ensure => present, }")
+    apply_manifest_on(host, "group { '#{group}': ensure => present, }", :catch_failures => true)
   end
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-    on(host, "ps ax | grep '#{ruby} /tmp/http_daemon.rb' | grep -v grep | awk '{print \"kill -9 \" $1}' | sh")
-    apply_manifest_on(host, "group { '#{group}': ensure => absent, }")
+    on(host, "ps ax | grep '#{ruby} /tmp/http_daemon.rb' | grep -v grep | awk '{print \"kill -9 \" $1}' | sh ; sleep 1")
+    apply_manifest_on(host, "group { '#{group}': ensure => absent, }", :catch_failures => true)
   end
 
   step 'checkout a group with puppet' do
@@ -45,8 +45,8 @@ hosts.each do |host|
     }
     EOS
 
-    apply_manifest_on(host, pp)
-    apply_manifest_on(host, pp)
+    apply_manifest_on(host, pp, :catch_failures => true)
+    apply_manifest_on(host, pp, :catch_changes  => true)
   end
 
   step "verify git checkout is own by group #{group}" do