Fix for #2657 (retain old setting if config has syntax error)

This appears to be regression introduced by threading changes.  The fix was
to rearrange things to keep the old behaviour (don't clear the settings
until you know the config file parses) and the new (don't nest calls to
synchronize) by:

1. Splitting clear into two parts--clear, which works as before, and
unsafe_clear which it calls and which expects synchronization to be
handled externally.

2. Rearranging the code to recover the previous calling order

3. Trapping syntax errors and turning them into logged messages and a
no-op effect.

4. Fixing reparse to not wrap a call to this code with a synchronize.

5. Tests.

Signed-off-by: Markus Roberts <Markus@reality.com>

1 files changed, 19 insertions, 0 deletions

diff --git a/spec/unit/util/settings.rb b/spec/unit/util/settings.rb
index aa2101f6e..56428132d 100755
--- a/spec/unit/util/settings.rb
+++ b/spec/unit/util/settings.rb
@@ -579,6 +579,25 @@ describe Puppet::Util::Settings do
             # and we should now have the new value in memory
             @settings[:two].should == "disk-replace"
         end
+
+        it "should retain in-memory values if the file has a syntax error" do
+            # Init the value
+            text = "[main]\none = initial-value\n"
+            @settings.expects(:read_file).returns(text)
+            @settings.parse
+            @settings[:one].should == "initial-value"
+
+            # Now replace the value with something bogus
+            text = "[main]\nkenny = killed-by-what-follows\n1 is 2, blah blah florp\n"
+            @settings.expects(:read_file).returns(text)
+            @settings.parse
+
+            # The originally-overridden value should not be replaced with the default
+            @settings[:one].should == "initial-value"
+
+            # and we should not have the new value in memory
+            @settings[:kenny].should be_nil
+        end
     end
 
     it "should provide a method for creating a catalog of resources from its configuration" do