diff options
author | Morgan Haskel <morgan@puppetlabs.com> | 2014-12-26 15:27:20 -0800 |
---|---|---|
committer | Morgan Haskel <morgan@puppetlabs.com> | 2014-12-26 15:49:52 -0800 |
commit | 56f25d57dfa26de618416e9bdd4a853296ffcbc1 (patch) | |
tree | 46a6c7e81c71f6b91e547cc49099da503658a6f3 /spec/unit/puppet/provider/vcsrepo | |
parent | 2295710e094ef849052e4b785819a1ba3a2c0fc6 (diff) | |
download | puppet-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/unit/puppet/provider/vcsrepo')
-rw-r--r-- | spec/unit/puppet/provider/vcsrepo/git_spec.rb | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/spec/unit/puppet/provider/vcsrepo/git_spec.rb b/spec/unit/puppet/provider/vcsrepo/git_spec.rb index 122eb62..edc7202 100644 --- a/spec/unit/puppet/provider/vcsrepo/git_spec.rb +++ b/spec/unit/puppet/provider/vcsrepo/git_spec.rb @@ -175,28 +175,6 @@ branches provider.expects(:git).with('checkout', '--force', resource.value(:revision)) provider.create end - it "should warn about destroying it using force and noop attribute" do - resource[:force] = true - resource[:noop] = true - resource.delete(:revision) - provider.expects(:working_copy_exists?).returns(true) - - provider.expects(:destroy).never - provider.expects(:create).never - Puppet::Type::Vcsrepo::Ensure.any_instance.expects(:send_log).with(:notice, "Noop Mode - Would have deleted repository and re-created from latest") - provider.resource.retrieve - end - it "should warn about destroying it using force and global noop" do - resource[:force] = true - Puppet[:noop] = true - resource.delete(:revision) - provider.expects(:working_copy_exists?).returns(true) - - provider.expects(:destroy).never - provider.expects(:create).never - Puppet::Type::Vcsrepo::Ensure.any_instance.expects(:send_log).with(:notice, "Noop Mode - Would have deleted repository and re-created from latest") - provider.resource.retrieve - end end context "when the path is not empty and not a repository" do |