From 875820f011f2aaf6e3f3f3f858c142317cb625a1 Mon Sep 17 00:00:00 2001 From: Nick Thomas Date: Sun, 13 Nov 2011 18:43:43 +0000 Subject: [PATCH] Creating a new socket is #new, not #connect --- lib/qmp_client.rb | 4 ++-- test/unit/test_qmp_client.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/qmp_client.rb b/lib/qmp_client.rb index b5f856a..f7b6ab8 100644 --- a/lib/qmp_client.rb +++ b/lib/qmp_client.rb @@ -11,14 +11,14 @@ require 'qmp_client/messages' module QMPClient def self.connect_unix(filename, &blk) - sock = UNIXSocket.connect(filename) + sock = UNIXSocket.new(filename) connect_socket(sock, &blk) ensure sock.close if sock && !sock.closed? end def self.connect_tcp(host, port, local_host=nil, local_port=nil, &blk) - sock = TCPSocket.connect(host, port, local_host, local_port) + sock = TCPSocket.new(host, port, local_host, local_port) connect_socket(sock, &blk) ensure sock.close if sock && !sock.closed? diff --git a/test/unit/test_qmp_client.rb b/test/unit/test_qmp_client.rb index cc499e3..7c6a1eb 100644 --- a/test/unit/test_qmp_client.rb +++ b/test/unit/test_qmp_client.rb @@ -30,7 +30,7 @@ module TestQMPClient cargs = ["127.0.0.1", 4440, "127.0.0.1", 40000] mock_sock = mock("(tcp-socket)") mock_sock.stubs(:closed? => false, :close => true) - TCPSocket.expects(:connect).with(*cargs).once.returns(mock_sock) + TCPSocket.expects(:new).with(*cargs).once.returns(mock_sock) expects_socket_run(mock_sock) runs_api_block = false @@ -44,7 +44,7 @@ module TestQMPClient def test_connect_unix mock_sock = mock("(unix-socket)") mock_sock.stubs(:closed? => false, :close => true) - UNIXSocket.expects(:connect).with("/tmp/test.sock").once.returns(mock_sock) + UNIXSocket.expects(:new).with("/tmp/test.sock").once.returns(mock_sock) expects_socket_run(mock_sock)