summaryrefslogtreecommitdiff
path: root/spec/acceptance/beaker/git/group_checkout/group_checkout_file_path.rb
diff options
context:
space:
mode:
authorHunter Haugen <hunter@puppetlabs.com>2014-05-20 18:15:03 -0700
committerHunter Haugen <hunter@puppetlabs.com>2014-05-21 16:49:26 -0700
commit0d9e938e92a25673c3712866e2d2108a255b67d5 (patch)
tree9b183ce838cb37823ec525407050a362b1eedf1c /spec/acceptance/beaker/git/group_checkout/group_checkout_file_path.rb
parent93e0c80f38efbd1317fc3b71218cc7fd047d639a (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/group_checkout/group_checkout_file_path.rb')
-rw-r--r--spec/acceptance/beaker/git/group_checkout/group_checkout_file_path.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/acceptance/beaker/git/group_checkout/group_checkout_file_path.rb b/spec/acceptance/beaker/git/group_checkout/group_checkout_file_path.rb
index 6701dda..c204792 100644
--- a/spec/acceptance/beaker/git/group_checkout/group_checkout_file_path.rb
+++ b/spec/acceptance/beaker/git/group_checkout/group_checkout_file_path.rb
@@ -14,12 +14,12 @@ hosts.each do |host|
end
step 'setup - create group' do
- apply_manifest_on(host, "group { '#{group}': ensure => present, }")
+ apply_manifest_on(host, "group { '#{group}': ensure => present, }", :catch_failures => true)
end
teardown do
on(host, "rm -fr #{tmpdir}")
- apply_manifest_on(host, "group { '#{group}': ensure => absent, }")
+ apply_manifest_on(host, "group { '#{group}': ensure => absent, }", :catch_failures => true)
end
step 'checkout a group with puppet' do
@@ -32,8 +32,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 own by group #{group}" do