diff options
| author | John Duarte <john.duarte@puppetlabs.com> | 2014-05-21 18:17:31 -0700 |
|---|---|---|
| committer | John Duarte <john.duarte@puppetlabs.com> | 2014-05-21 18:17:31 -0700 |
| commit | 2f875839afe843bd8a9f320d553fb3a28a7420f8 (patch) | |
| tree | 681e6f1b03ca99eed51ad2bec40b9a3b192ee48f /spec/acceptance/beaker/git/clone/negative | |
| parent | 9057fca3a6862e699c153f3607e57f2360552eb7 (diff) | |
| parent | 0d9e938e92a25673c3712866e2d2108a255b67d5 (diff) | |
| download | puppet-vcsrepo-2f875839afe843bd8a9f320d553fb3a28a7420f8.tar.gz puppet-vcsrepo-2f875839afe843bd8a9f320d553fb3a28a7420f8.tar.bz2 | |
Merge pull request #145 from hunner/fix_beaker_tests
Update specs and fix FM-1361
Diffstat (limited to 'spec/acceptance/beaker/git/clone/negative')
| -rw-r--r-- | spec/acceptance/beaker/git/clone/negative/clone_over_different_exiting_repo.rb | 3 | ||||
| -rw-r--r-- | spec/acceptance/beaker/git/clone/negative/clone_repo_with_exec_excludes.rb | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/spec/acceptance/beaker/git/clone/negative/clone_over_different_exiting_repo.rb b/spec/acceptance/beaker/git/clone/negative/clone_over_different_exiting_repo.rb index 67fea06..8adb1af 100644 --- a/spec/acceptance/beaker/git/clone/negative/clone_over_different_exiting_repo.rb +++ b/spec/acceptance/beaker/git/clone/negative/clone_over_different_exiting_repo.rb @@ -31,7 +31,8 @@ hosts.each do |host| } EOS - apply_manifest_on(host, pp) + apply_manifest_on(host, pp, :catch_failures => true) + apply_manifest_on(host, pp, :catch_changes => true) end step 'verify original repo was not replaced' do diff --git a/spec/acceptance/beaker/git/clone/negative/clone_repo_with_exec_excludes.rb b/spec/acceptance/beaker/git/clone/negative/clone_repo_with_exec_excludes.rb index b994a6a..2264015 100644 --- a/spec/acceptance/beaker/git/clone/negative/clone_repo_with_exec_excludes.rb +++ b/spec/acceptance/beaker/git/clone/negative/clone_repo_with_exec_excludes.rb @@ -28,8 +28,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 excludes are known to git' do |