Skip to content

(#13204) Don't ignore missing PATH.augnew files #660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeffweiss merged 1 commit into from
Apr 12, 2012
Merged

(#13204) Don't ignore missing PATH.augnew files #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions lib/puppet/provider/augeas/augeas.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,9 +297,8 @@ def need_to_run?
saved_files = @aug.match("/augeas/events/saved")
if saved_files.size > 0
root = resource[:root].sub(/^\/$/, "")
saved_files.each do |key|
saved_file = @aug.get(key).sub(/^\/files/, root)
next unless File.exists?(saved_file + ".augnew")
saved_files.map! {|key| @aug.get(key).sub(/^\/files/, root) }
saved_files.uniq.each do |saved_file|
if Puppet[:show_diff]
notice "\n" + diff(saved_file, saved_file + ".augnew")
end
Expand Down
13 changes: 2 additions & 11 deletions spec/unit/provider/augeas/augeas_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,6 @@
it "should call diff when a file is shown to have been changed" do
file = "/etc/hosts"
File.stubs(:delete)
File.stubs(:exists?).returns(true)

@resource[:context] = "/files"
@resource[:changes] = ["set #{file}/foo bar"]
Expand All @@ -347,7 +346,6 @@
file1 = "/etc/hosts"
file2 = "/etc/resolv.conf"
File.stubs(:delete)
File.stubs(:exists?).returns(true)

@resource[:context] = "/files"
@resource[:changes] = ["set #{file1}/foo bar", "set #{file2}/baz biz"]
Expand All @@ -368,7 +366,6 @@
root = "/tmp/foo"
file = "/etc/hosts"
File.stubs(:delete)
File.stubs(:exists?).returns(true)

@resource[:context] = "/files"
@resource[:changes] = ["set #{file}/foo bar"]
Expand Down Expand Up @@ -401,7 +398,6 @@

it "should cleanup the .augnew file" do
file = "/etc/hosts"
File.stubs(:exists?).returns(true)

@resource[:context] = "/files"
@resource[:changes] = ["set #{file}/foo bar"]
Expand All @@ -421,11 +417,6 @@
it "should handle duplicate /augeas/events/saved filenames" do
file = "/etc/hosts"

augnew = states("augnew").starts_as("present")

File.stubs(:exists?).returns(true).when(augnew.is("present"))
File.stubs(:exists?).returns(false).when(augnew.is("absent"))

@resource[:context] = "/files"
@resource[:changes] = ["set #{file}/foo bar"]

Expand All @@ -435,9 +426,9 @@
@augeas.expects(:set).with("/augeas/save", "newfile")
@augeas.expects(:close)

File.expects(:delete).with(file + ".augnew").when(augnew.is("present")).then(augnew.is("absent"))
File.expects(:delete).with(file + ".augnew").once()

@provider.expects(:diff).with("#{file}", "#{file}.augnew").returns("").when(augnew.is("present"))
@provider.expects(:diff).with("#{file}", "#{file}.augnew").returns("").once()
@provider.should be_need_to_run
end

Expand Down