summaryrefslogtreecommitdiff
path: root/spec/acceptance/beaker/git/clone/clone_http.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/acceptance/beaker/git/clone/clone_http.rb')
-rw-r--r--spec/acceptance/beaker/git/clone/clone_http.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/acceptance/beaker/git/clone/clone_http.rb b/spec/acceptance/beaker/git/clone/clone_http.rb
index 664ab10..5ba7915 100644
--- a/spec/acceptance/beaker/git/clone/clone_http.rb
+++ b/spec/acceptance/beaker/git/clone/clone_http.rb
@@ -26,7 +26,7 @@ hosts.each do |host|
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")
+ on(host, "ps ax | grep '#{ruby} /tmp/http_daemon.rb' | grep -v grep | awk '{print \"kill -9 \" $1}' | sh ; sleep 1")
end
step 'clone with puppet' do
@@ -38,8 +38,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 on the master branch" do