Fix for #2670, Puppet silently ignores catalog_format

Since "preferred_serialization_format" was introduced, the older
"catalog_format" setting (yaml|marshal), when provided, has been
silently ignored and the default for "preferred_serialization_format"
used.  This re-introduces "catalog_format," logs a deprecation notice,
and passes on any provided value to "preferred_serialization_format."

Signed-off-by: Bruce Williams <bruce@codefluency.com>

1 files changed, 11 insertions, 0 deletions

diff --git a/spec/integration/defaults.rb b/spec/integration/defaults.rb
index fb00f8646..292abbb87 100755
--- a/spec/integration/defaults.rb
+++ b/spec/integration/defaults.rb
@@ -29,6 +29,17 @@ describe "Puppet defaults" do
         end
     end
 
+    describe "when setting the :catalog_format" do
+        it "should log a deprecation notice" do
+            Puppet.expects(:warning)
+            Puppet.settings[:catalog_format] = 'marshal'
+        end
+        it "should copy the value to :preferred_serialization_format" do
+            Puppet.settings[:catalog_format] = 'marshal'
+            Puppet.settings[:preferred_serialization_format].should == 'marshal'
+        end
+    end
+
     it "should have a clientyamldir setting" do
         Puppet.settings[:clientyamldir].should_not be_nil
     end