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/branch_checkout/negative/branch_checkout_not_exists.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/branch_checkout/negative/branch_checkout_not_exists.rb')
| -rw-r--r-- | spec/acceptance/beaker/git/branch_checkout/negative/branch_checkout_not_exists.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/spec/acceptance/beaker/git/branch_checkout/negative/branch_checkout_not_exists.rb b/spec/acceptance/beaker/git/branch_checkout/negative/branch_checkout_not_exists.rb index f8c85d0..e44ea7e 100644 --- a/spec/acceptance/beaker/git/branch_checkout/negative/branch_checkout_not_exists.rb +++ b/spec/acceptance/beaker/git/branch_checkout/negative/branch_checkout_not_exists.rb @@ -26,8 +26,7 @@ hosts.each do |host| } EOS - apply_manifest_on(host, pp) - apply_manifest_on(host, pp) + apply_manifest_on(host, pp, :expect_failures => true) end step 'verify that master branch is checked out' do |