Update specs and fix FM-1361

[puppet_vcsrepo.git] / spec / acceptance / beaker / git / revision_checkout / revision_checkout_git.rb

diff --git a/spec/acceptance/beaker/git/revision_checkout/revision_checkout_git.rb b/spec/acceptance/beaker/git/revision_checkout/revision_checkout_git.rb
index 3fa6cbd..52349d7 100644 (file)
--- a/spec/acceptance/beaker/git/revision_checkout/revision_checkout_git.rb
+++ b/spec/acceptance/beaker/git/revision_checkout/revision_checkout_git.rb
@@ -18,7 +18,7 @@ hosts.each do |host|
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-    on(host, 'pkill -9 git-daemon')
+    on(host, 'pkill -9 git-daemon ; sleep 1')
   end
 
   step 'get revision sha from repo' do
@@ -37,8 +37,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 checkout is set to revision #{@sha}" do