summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2010-04-24 02:47:52 +1000
committerJames Turnbull <james@lovedthanlost.net>2010-04-24 02:47:52 +1000
commit44f6d64876f60cbed27e79ba0c64377ebcb9a07e (patch)
treed32f26eebc99312ca6941d3b405f3c13d85a277f
parent3a1b178e9622494088473042336e45d59f896dac (diff)
downloadpuppet-44f6d64876f60cbed27e79ba0c64377ebcb9a07e.tar.gz
puppet-44f6d64876f60cbed27e79ba0c64377ebcb9a07e.tar.xz
puppet-44f6d64876f60cbed27e79ba0c64377ebcb9a07e.zip
Partial fix to #2837 - changed warning message to debug
-rw-r--r--lib/puppet/network/format_handler.rb2
-rwxr-xr-xspec/unit/network/format_handler.rb5
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/puppet/network/format_handler.rb b/lib/puppet/network/format_handler.rb
index ea8cf35de..dce1bca21 100644
--- a/lib/puppet/network/format_handler.rb
+++ b/lib/puppet/network/format_handler.rb
@@ -142,7 +142,7 @@ module Puppet::Network::FormatHandler
list.delete(preferred_format)
list.unshift(preferred_format)
else
- Puppet.warning "Value of 'preferred_serialization_format' (#{preferred_format}) is invalid for #{friendly_name}, using default (#{list.first})"
+ Puppet.debug "Value of 'preferred_serialization_format' (#{preferred_format}) is invalid for #{friendly_name}, using default (#{list.first})"
end
list
end
diff --git a/spec/unit/network/format_handler.rb b/spec/unit/network/format_handler.rb
index 110effe09..7fb065b5c 100755
--- a/spec/unit/network/format_handler.rb
+++ b/spec/unit/network/format_handler.rb
@@ -73,8 +73,9 @@ describe Puppet::Network::FormatHandler do
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)
+ it "should log a debug message" do
+ Puppet.expects(:debug).with("Value of 'preferred_serialization_format' (unsupported) is invalid for FormatTester, using default (two)")
+ Puppet.expects(:debug).with("FormatTester supports formats: one two; using two")
FormatTester.supported_formats
end
end