diff options
| -rw-r--r-- | lib/puppet/network/format_handler.rb | 2 | ||||
| -rwxr-xr-x | spec/unit/network/format_handler.rb | 36 |
2 files changed, 30 insertions, 8 deletions
diff --git a/lib/puppet/network/format_handler.rb b/lib/puppet/network/format_handler.rb index 2ffbcef3d..e508a0283 100644 --- a/lib/puppet/network/format_handler.rb +++ b/lib/puppet/network/format_handler.rb @@ -129,6 +129,8 @@ module Puppet::Network::FormatHandler if list.include?(preferred_format) list.delete(preferred_format) list.unshift(preferred_format) + else + Puppet.warning "Value of 'preferred_serialization_format' ('#{preferred_format}') is invalid, using default ('#{list.first}')" end list end diff --git a/spec/unit/network/format_handler.rb b/spec/unit/network/format_handler.rb index 8a79a58b3..110effe09 100755 --- a/spec/unit/network/format_handler.rb +++ b/spec/unit/network/format_handler.rb @@ -49,15 +49,35 @@ 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] + describe "with a preferred serialization format setting" do + before do + one = stub 'supported', :supported? => true, :name => :one, :weight => 1 + two = stub 'supported', :supported? => true, :name => :two, :weight => 6 + 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 + end + describe "that is supported" do + before do + Puppet.settings.expects(:value).with(:preferred_serialization_format).returns :one + end + it "should return the preferred serialization format first" do + FormatTester.supported_formats.should == [:one, :two] + end + end + describe "that is not supported" do + before do + Puppet.settings.expects(:value).with(:preferred_serialization_format).returns :unsupported + end + it "should still return the default format first" do + FormatTester.supported_formats.should == [:two, :one] + end + it "should log a warning" do + Puppet.expects(:warning) + FormatTester.supported_formats + end + end end it "should return the first format as the default format" do |