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

1 files changed, 5 insertions, 5 deletions

diff --git a/spec/acceptance/beaker/git/user_checkout/user_checkout_git.rb b/spec/acceptance/beaker/git/user_checkout/user_checkout_git.rb
index d7504b0..1fb61b6 100644
--- a/spec/acceptance/beaker/git/user_checkout/user_checkout_git.rb
+++ b/spec/acceptance/beaker/git/user_checkout/user_checkout_git.rb
@@ -18,13 +18,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, 'pkill -9 git-daemon')
-    apply_manifest_on(host, "user { '#{user}': ensure => absent, }")
+    on(host, 'pkill -9 git-daemon ; sleep 1')
+    apply_manifest_on(host, "user { '#{user}': ensure => absent, }", :catch_failures => true)
   end
 
   step 'checkout a user with puppet' 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 git checkout is owned by user #{user}" do