diff options
author | Hunter Haugen <hunter@puppetlabs.com> | 2014-05-20 18:15:03 -0700 |
---|---|---|
committer | Hunter Haugen <hunter@puppetlabs.com> | 2014-05-21 16:49:26 -0700 |
commit | 0d9e938e92a25673c3712866e2d2108a255b67d5 (patch) | |
tree | 9b183ce838cb37823ec525407050a362b1eedf1c /spec/acceptance/beaker/git/user_checkout/user_checkout_http.rb | |
parent | 93e0c80f38efbd1317fc3b71218cc7fd047d639a (diff) |
Update specs and fix FM-1361
- Add install.rb for pre-suite
- Add catches for failures/changes to manifest application
- Correct root ssh key copying
- Add sleeps for killing processes releasing ports
- Fix FM-1361
Diffstat (limited to 'spec/acceptance/beaker/git/user_checkout/user_checkout_http.rb')
-rw-r--r-- | spec/acceptance/beaker/git/user_checkout/user_checkout_http.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/acceptance/beaker/git/user_checkout/user_checkout_http.rb b/spec/acceptance/beaker/git/user_checkout/user_checkout_http.rb index 07f5c1c..03ea27b 100644 --- a/spec/acceptance/beaker/git/user_checkout/user_checkout_http.rb +++ b/spec/acceptance/beaker/git/user_checkout/user_checkout_http.rb @@ -26,13 +26,13 @@ hosts.each do |host| end step 'setup - create user' do - apply_manifest_on(host, "user { '#{user}': ensure => present, }") + apply_manifest_on(host, "user { '#{user}': 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, "user { '#{user}': 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, "user { '#{user}': ensure => absent, }", :catch_failures => true) end step 'checkout a user 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 owned by user #{user}" do |