Merge pull request #145 from hunner/fix_beaker_tests

Update specs and fix FM-1361

1 files changed, 6 insertions, 5 deletions

diff --git a/spec/acceptance/beaker/git/branch_checkout/branch_checkout_scp.rb b/spec/acceptance/beaker/git/branch_checkout/branch_checkout_scp.rb
index 0a4e07a..e55f805 100644
--- a/spec/acceptance/beaker/git/branch_checkout/branch_checkout_scp.rb
+++ b/spec/acceptance/beaker/git/branch_checkout/branch_checkout_scp.rb
@@ -14,17 +14,18 @@ hosts.each do |host|
   end
   step 'setup - establish ssh keys' do
     # create ssh keys
-    on(host, 'ssh-keygen -q -t rsa -f /root/.ssh/id_rsa -N ""')
+    on(host, 'yes | ssh-keygen -q -t rsa -f /root/.ssh/id_rsa -N ""')
 
     # copy public key to authorized_keys
+    on(host, 'cat /root/.ssh/id_rsa.pub >> /root/.ssh/authorized_keys')
     on(host, 'echo -e "Host *\n\tStrictHostKeyChecking no\n" >> /root/.ssh/config')
     on(host, 'chown -R root:root /root/.ssh')
   end
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-      apply_manifest_on(host, "file{'/root/.ssh/id_rsa': ensure => absent, force => true }")
-      apply_manifest_on(host, "file{'/root/.ssh/id_rsa.pub': ensure => absent, force => true }")
+    apply_manifest_on(host, "file{'/root/.ssh/id_rsa': ensure => absent, force => true }", :catch_failures => true)
+    apply_manifest_on(host, "file{'/root/.ssh/id_rsa.pub': ensure => absent, force => true }", :catch_failures => true)
   end
 
   step 'checkout a branch with puppet' do
@@ -37,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 #{branch} branch" do