diff options
author | Paul Berry <paul@puppetlabs.com> | 2010-12-29 11:15:23 -0800 |
---|---|---|
committer | Paul Berry <paul@puppetlabs.com> | 2010-12-30 11:47:16 -0800 |
commit | 1907650515ca68e85e63c73e1a35ec30dbc81b0d (patch) | |
tree | 085190fd1f724df355416d644697a6fb2b24925a | |
parent | e596a570b2734ea27eec57a6e3a11843ccb47614 (diff) | |
download | puppet-1907650515ca68e85e63c73e1a35ec30dbc81b0d.tar.gz puppet-1907650515ca68e85e63c73e1a35ec30dbc81b0d.tar.xz puppet-1907650515ca68e85e63c73e1a35ec30dbc81b0d.zip |
(#5715) Removed redundant attribute Resource::Status#version
-rw-r--r-- | lib/puppet/resource/status.rb | 4 | ||||
-rwxr-xr-x | spec/unit/resource/status_spec.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/puppet/resource/status.rb b/lib/puppet/resource/status.rb index 2bfadbd54..43d3f1644 100644 --- a/lib/puppet/resource/status.rb +++ b/lib/puppet/resource/status.rb @@ -4,7 +4,7 @@ module Puppet include Puppet::Util::Tagging include Puppet::Util::Logging - attr_accessor :resource, :node, :version, :file, :line, :current_values, :status, :evaluation_time + attr_accessor :resource, :node, :file, :line, :current_values, :status, :evaluation_time STATES = [:skipped, :failed, :failed_to_restart, :restarted, :changed, :out_of_sync, :scheduled] attr_accessor *STATES @@ -48,7 +48,7 @@ module Puppet @change_count = 0 @out_of_sync_count = 0 - [:file, :line, :version].each do |attr| + [:file, :line].each do |attr| send(attr.to_s + "=", resource.send(attr)) end diff --git a/spec/unit/resource/status_spec.rb b/spec/unit/resource/status_spec.rb index 08cb99b27..22d5fb4f9 100755 --- a/spec/unit/resource/status_spec.rb +++ b/spec/unit/resource/status_spec.rb @@ -10,7 +10,7 @@ describe Puppet::Resource::Status do @status = Puppet::Resource::Status.new(@resource) end - [:node, :version, :file, :line, :current_values, :status, :evaluation_time].each do |attr| + [:node, :file, :line, :current_values, :status, :evaluation_time].each do |attr| it "should support #{attr}" do @status.send(attr.to_s + "=", "foo") @status.send(attr).should == "foo" @@ -38,7 +38,7 @@ describe Puppet::Resource::Status do Puppet::Resource::Status.new(@resource).source_description.should == "/my/path" end - [:file, :line, :version].each do |attr| + [:file, :line].each do |attr| it "should copy the resource's #{attr}" do @resource.expects(attr).returns "foo" Puppet::Resource::Status.new(@resource).send(attr).should == "foo" |