diff options
author | Paul Berry <paul@puppetlabs.com> | 2011-01-07 15:39:52 -0800 |
---|---|---|
committer | Paul Berry <paul@puppetlabs.com> | 2011-01-07 15:46:33 -0800 |
commit | 8f314f2bb14d61a2a26b67d002d90f84349b25b5 (patch) | |
tree | 5b5377e91a9188e68a52fc47525792a7ddc360b1 /spec | |
parent | e2700869a98ed769cea3d880a23e2f80330ea0fc (diff) | |
download | puppet-8f314f2bb14d61a2a26b67d002d90f84349b25b5.tar.gz puppet-8f314f2bb14d61a2a26b67d002d90f84349b25b5.tar.xz puppet-8f314f2bb14d61a2a26b67d002d90f84349b25b5.zip |
(#5710) Removed unnecessary calls to insync?
In the resource harness, we were calling insync? on all properties of
a resource, even if those properties weren't being managed. This was
unsafe. Changed to only call insync? on properties that are mentioned
in the manifest.
In addition, we discovered that the resource harness's computation of
desired_values was incorrect, and was consulting the current system
state rather than the desired state. Since this hash was
(erroneously) only being consulted to see if it included :ensure, this
didn't cause any obvious bugs. However it is now fixed.
Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
Diffstat (limited to 'spec')
-rwxr-xr-x | spec/unit/transaction/resource_harness_spec.rb | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/spec/unit/transaction/resource_harness_spec.rb b/spec/unit/transaction/resource_harness_spec.rb index f0c360e22..104c19e85 100755 --- a/spec/unit/transaction/resource_harness_spec.rb +++ b/spec/unit/transaction/resource_harness_spec.rb @@ -125,6 +125,29 @@ describe Puppet::Transaction::ResourceHarness do end end + describe "when auditing" do + it "should not call insync? on parameters that are merely audited" do + stub_provider = make_stub_provider + resource = stub_provider.new :name => 'name', :audit => ['foo'] + resource.property(:foo).expects(:insync?).never + status = @harness.evaluate(resource) + status.events.each do |event| + event.status.should != 'failure' + end + end + + it "should be able to audit a file's group" do # see bug #5710 + test_file = tmpfile('foo') + File.open(test_file, 'w').close + resource = Puppet::Type.type(:file).new :path => test_file, :audit => ['group'], :backup => false + resource.expects(:err).never # make sure no exceptions get swallowed + status = @harness.evaluate(resource) + status.events.each do |event| + event.status.should != 'failure' + end + end + end + describe "when applying changes" do [false, true].each do |noop_mode|; describe (noop_mode ? "in noop mode" : "in normal mode") do [nil, '750'].each do |machine_state|; describe (machine_state ? "with a file initially present" : "with no file initially present") do |