From 623d9c75ae7b195c1668fe5fc9b18da14c4bdb97 Mon Sep 17 00:00:00 2001 From: Jesse Wolfe Date: Thu, 3 Dec 2009 14:46:28 -0800 Subject: Fixing 2886: Failing specs in format_handler Clean up warning messages so that they don't fail when run inside the test class. Signed-off-by: Jesse Wolfe --- lib/puppet/network/format_handler.rb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/puppet/network/format_handler.rb b/lib/puppet/network/format_handler.rb index 544ba8291..ea8cf35de 100644 --- a/lib/puppet/network/format_handler.rb +++ b/lib/puppet/network/format_handler.rb @@ -121,20 +121,28 @@ module Puppet::Network::FormatHandler result = put_preferred_format_first(result) - Puppet.debug "#{indirection.name} supports formats: #{result.sort.join(' ')}; using #{result.first}" + Puppet.debug "#{friendly_name} supports formats: #{result.map{ |f| f.to_s }.sort.join(' ')}; using #{result.first}" result end private + def friendly_name + if self.respond_to? :indirection + indirection.name + else + self + end + end + def put_preferred_format_first(list) preferred_format = Puppet.settings[:preferred_serialization_format].to_sym 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 for #{indirection.name}, using default (#{list.first})" + Puppet.warning "Value of 'preferred_serialization_format' (#{preferred_format}) is invalid for #{friendly_name}, using default (#{list.first})" end list end -- cgit