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/basic_auth/negative | |
| parent | 93e0c80f38efbd1317fc3b71218cc7fd047d639a (diff) | |
| download | puppet-vcsrepo-0d9e938e92a25673c3712866e2d2108a255b67d5.tar.gz puppet-vcsrepo-0d9e938e92a25673c3712866e2d2108a255b67d5.tar.bz2 | |
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/basic_auth/negative')
| -rw-r--r-- | spec/acceptance/beaker/git/basic_auth/negative/basic_auth_checkout_git.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/acceptance/beaker/git/basic_auth/negative/basic_auth_checkout_git.rb b/spec/acceptance/beaker/git/basic_auth/negative/basic_auth_checkout_git.rb index 60a4fc2..67544bf 100644 --- a/spec/acceptance/beaker/git/basic_auth/negative/basic_auth_checkout_git.rb +++ b/spec/acceptance/beaker/git/basic_auth/negative/basic_auth_checkout_git.rb @@ -22,7 +22,7 @@ hosts.each do |host| teardown do on(host, "rm -fr #{tmpdir}") - on(host, 'pkill -9 git-daemon') + on(host, 'pkill -9 git-daemon ; sleep 1') end step 'checkout with puppet using basic auth' do @@ -36,8 +36,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 (silent error for basic auth using git protocol)" do |