Adding support for specifying a preferred serialization format

This isn't that great, but at least it provides
basic tuning of the format.

Also removing the catalog_format default, since it's
no longer used.

Signed-off-by: Luke Kanies <luke@madstop.com>

1 files changed, 11 insertions, 0 deletions

diff --git a/spec/unit/network/format_handler.rb b/spec/unit/network/format_handler.rb
index 8d11583ef..54409b92a 100755
--- a/spec/unit/network/format_handler.rb
+++ b/spec/unit/network/format_handler.rb
@@ -49,6 +49,17 @@ describe Puppet::Network::FormatHandler do
         FormatTester.supported_formats.should == [:four, :two, :three, :one]
     end
 
+    it "should always put the preferred serialization format first if it is supported" do
+        one = stub 'supported', :supported? => true, :name => :one, :weight => 1
+        two = stub 'supported', :supported? => true, :name => :two, :weight => 6
+
+        Puppet.settings.expects(:value).with(:preferred_serialization_format).returns :one
+        Puppet::Network::FormatHandler.stubs(:formats).returns [:one, :two]
+        Puppet::Network::FormatHandler.stubs(:format).with(:one).returns one
+        Puppet::Network::FormatHandler.stubs(:format).with(:two).returns two
+        FormatTester.supported_formats.should == [:one, :two]
+    end
+
     it "should return the first format as the default format" do
         FormatTester.expects(:supported_formats).returns [:one, :two]
         FormatTester.default_format.should == :one