diff options
| author | Luke Kanies <luke@madstop.com> | 2009-02-14 18:10:37 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2009-02-14 18:10:37 -0600 |
| commit | e87de9d8f3be325fb0495dd5c64e08625333924f (patch) | |
| tree | 8a7ed2ff7e375f3c0c91623de1ccf8b71a1d7317 /spec/unit/network | |
| parent | 487b9b1a3e8b9207a9910bc5eaeeb75cb3e4abe5 (diff) | |
| parent | 24d48e6c07ef634971fcb8ed5b27258db161a018 (diff) | |
| download | puppet-e87de9d8f3be325fb0495dd5c64e08625333924f.tar.gz puppet-e87de9d8f3be325fb0495dd5c64e08625333924f.tar.xz puppet-e87de9d8f3be325fb0495dd5c64e08625333924f.zip | |
Merge branch '0.24.x'
Conflicts:
test/ral/manager/type.rb
Diffstat (limited to 'spec/unit/network')
| -rwxr-xr-x | spec/unit/network/xmlrpc/client.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/unit/network/xmlrpc/client.rb b/spec/unit/network/xmlrpc/client.rb index 36e59429c..328688bae 100755 --- a/spec/unit/network/xmlrpc/client.rb +++ b/spec/unit/network/xmlrpc/client.rb @@ -109,7 +109,7 @@ describe Puppet::Network::XMLRPCClient do it "should log, recycle the connection, and retry if Errno::EPIPE is raised" do @client.expects(:call).times(2).raises(Errno::EPIPE).then.returns "eh" - Puppet.expects(:warning) + Puppet.expects(:info) @client.expects(:recycle_connection) @client.report("eh") @@ -118,7 +118,7 @@ describe Puppet::Network::XMLRPCClient do it "should log, recycle the connection, and retry if EOFError is raised" do @client.expects(:call).times(2).raises(EOFError).then.returns "eh" - Puppet.expects(:warning) + Puppet.expects(:info) @client.expects(:recycle_connection) @client.report("eh") |