summaryrefslogtreecommitdiff
path: root/spec/acceptance/beaker
diff options
context:
space:
mode:
authorMorgan Haskel <morgan@puppetlabs.com>2014-12-26 15:27:20 -0800
committerMorgan Haskel <morgan@puppetlabs.com>2014-12-26 15:49:52 -0800
commit56f25d57dfa26de618416e9bdd4a853296ffcbc1 (patch)
tree46a6c7e81c71f6b91e547cc49099da503658a6f3 /spec/acceptance/beaker
parent2295710e094ef849052e4b785819a1ba3a2c0fc6 (diff)
downloadpuppet-vcsrepo-56f25d57dfa26de618416e9bdd4a853296ffcbc1.tar.gz
puppet-vcsrepo-56f25d57dfa26de618416e9bdd4a853296ffcbc1.tar.bz2
MODULES-1596 - Repository repeatedly destroyed/created with force
The `retrieve` method was calling `create` and `destroy` on every run with `force => true`. Retrieve should not be making any changes to the system, so removed that code, and updated `working_copy_exists` to make sure that the directory not only contains a `.git` directory, but also if `source` is specified it also matches `#{path}/.git/config` so that it will overwrite a git repo with a different source. Updated tests to not check for the old broken behavior. Added a regression test.
Diffstat (limited to 'spec/acceptance/beaker')
-rw-r--r--spec/acceptance/beaker/git/clone/negative/clone_over_different_exiting_repo.rb3
1 files changed, 1 insertions, 2 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 6826673..1e3b4bb 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
@@ -35,8 +35,7 @@ hosts.each do |host|
}
EOS
- apply_manifest_on(host, pp, :catch_failures => true)
- apply_manifest_on(host, pp, :catch_changes => true)
+ apply_manifest_on(host, pp, :expect_failures => true)
end
step 'verify original repo was not replaced' do