diff options
author | John Duarte <john.duarte@puppetlabs.com> | 2014-05-21 18:17:31 -0700 |
---|---|---|
committer | John Duarte <john.duarte@puppetlabs.com> | 2014-05-21 18:17:31 -0700 |
commit | 2f875839afe843bd8a9f320d553fb3a28a7420f8 (patch) | |
tree | 681e6f1b03ca99eed51ad2bec40b9a3b192ee48f /spec/acceptance/beaker/git/revision_checkout/revision_checkout_git.rb | |
parent | 9057fca3a6862e699c153f3607e57f2360552eb7 (diff) | |
parent | 0d9e938e92a25673c3712866e2d2108a255b67d5 (diff) |
Merge pull request #145 from hunner/fix_beaker_tests
Update specs and fix FM-1361
Diffstat (limited to 'spec/acceptance/beaker/git/revision_checkout/revision_checkout_git.rb')
-rw-r--r-- | spec/acceptance/beaker/git/revision_checkout/revision_checkout_git.rb | 6 |
1 files changed, 3 insertions, 3 deletions
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 --- 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 |