rbczmq 1.7.4 → 1.7.5

data/test/socket/test_pub_socket.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.join(File.dirname(__FILE__), '..', 'helper')
+require File.expand_path("../../helper.rb", __FILE__)
 
 class TestPubSocket < ZmqTestCase
   def test_behavior

data/test/socket/test_pub_sub_sockets.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.join(File.dirname(__FILE__), '..', 'helper')
+require File.expand_path("../../helper.rb", __FILE__)
 
 class TestPubSubSockets < ZmqTestCase
   def test_flow

data/test/socket/test_pull_socket.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.join(File.dirname(__FILE__), '..', 'helper')
+require File.expand_path("../../helper.rb", __FILE__)
 
 class TestPullSocket < ZmqTestCase
   def test_behavior

data/test/socket/test_push_pull_sockets.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.join(File.dirname(__FILE__), '..', 'helper')
+require File.expand_path("../../helper.rb", __FILE__)
 
 class TestPushPullSockets < ZmqTestCase
   def test_flow

data/test/socket/test_push_socket.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.join(File.dirname(__FILE__), '..', 'helper')
+require File.expand_path("../../helper.rb", __FILE__)
 
 class TestPushSocket < ZmqTestCase
   def test_behavior

data/test/socket/test_rep_socket.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.join(File.dirname(__FILE__), '..', 'helper')
+require File.expand_path("../../helper.rb", __FILE__)
 
 class TestRepSocket < ZmqTestCase
   def test_behavior

data/test/socket/test_req_rep_sockets.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.join(File.dirname(__FILE__), '..', 'helper')
+require File.expand_path("../../helper.rb", __FILE__)
 
 class TestReqRepSockets < ZmqTestCase
   def test_flow

data/test/socket/test_req_socket.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.join(File.dirname(__FILE__), '..', 'helper')
+require File.expand_path("../../helper.rb", __FILE__)
 
 class TestReqSocket < ZmqTestCase
   def test_behavior

data/test/socket/test_router_socket.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.join(File.dirname(__FILE__), '..', 'helper')
+require File.expand_path("../../helper.rb", __FILE__)
 
 class TestRouterSocket < ZmqTestCase
   def test_behavior

data/test/socket/test_routing.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.join(File.dirname(__FILE__), '..', 'helper')
+require File.expand_path("../../helper.rb", __FILE__)
 
 class TestRouting < ZmqTestCase
   def test_flow

data/test/socket/test_stream_socket.rb

@@ -0,0 +1,74 @@
+# encoding: utf-8
+
+require File.expand_path("../../helper.rb", __FILE__)
+require 'socket'
+require 'timeout'
+
+class TestStreamSocket < ZmqTestCase
+  def test_behavior
+    ctx = ZMQ::Context.new
+    sock = ctx.socket(:STREAM)
+    assert_equal ZMQ::STREAM, sock.type
+    assert_equal "STREAM socket", sock.to_s
+  ensure
+    ctx.destroy
+  end
+
+  def test_recv_and_send
+    ctx = ZMQ::Context.new
+    sock = ctx.socket(:STREAM)
+    port = sock.bind("tcp://127.0.0.1:*")
+
+    tcp = TCPSocket.new('127.0.0.1', port)
+    tcp.write("hello")
+
+    Timeout.timeout(5) do
+      msg = sock.recv_message
+
+      # Messages received from a STREAM socket are in two parts:
+      # The first frame is an identiy frame.
+      # The second frame is the data received over the TCP socket.
+      assert_equal 2, msg.size
+
+      # first frame is the identity frame.
+      identity = msg.pop
+      assert_equal "hello", msg.first.to_s
+
+      sock.sendm(identity)
+      sock.send("goodbye")
+
+      reply = tcp.recv(100)
+      assert_equal "goodbye", reply
+    end
+
+  ensure
+    tcp.close if tcp
+    ctx.destroy
+  end
+
+  # This test should work, but may be a bug in zmq. leaving out for now:
+  # def test_close_tcp_connection
+  #   ctx = ZMQ::Context.new
+  #   sock = ctx.socket(:STREAM)
+  #   port = sock.bind("tcp://127.0.0.1:*")
+  #
+  #   tcp = TCPSocket.new('127.0.0.1', port)
+  #   tcp.write("hello")
+  #
+  #   Timeout.timeout(5) do
+  #     identity = sock.recv
+  #     message = sock.recv
+  #
+  #     sock.sendm identity
+  #     sock.send ""
+  #
+  #     # receiving a zero length string is a TCP end of stream = closed normally.
+  #     assert_equal "", tcp.recvfrom(100)
+  #   end
+  #
+  # ensure
+  #   tcp.close if tcp
+  #   ctx.destroy
+  # end
+
+end

data/test/socket/test_sub_socket.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.join(File.dirname(__FILE__), '..', 'helper')
+require File.expand_path("../../helper.rb", __FILE__)
 
 class TestSubSocket < ZmqTestCase
   def test_behavior

data/test/test_beacon.rb

@@ -1,10 +1,11 @@
 # encoding: utf-8
 
-require File.join(File.dirname(__FILE__), 'helper')
+require File.expand_path("../helper.rb", __FILE__)
 require 'socket'
 
 class TestZmqBeacon < ZmqTestCase
   def setup
+    GC.start
     r = Random.new
     begin
       # find a random port number that we are able to bind to, and use this port
@@ -78,6 +79,7 @@ class TestZmqBeacon < ZmqTestCase
   end
 
   def test_pipe
+    GC.start
     beacon = ZMQ::Beacon.new(@port)
     assert_instance_of ZMQ::Socket::Pair, beacon.pipe
     GC.start # check GC cycle with "detached" socket
@@ -106,4 +108,4 @@ class TestZmqBeacon < ZmqTestCase
     service_beacon.destroy
     client_beacon.destroy
   end
-end
+end

data/test/test_context.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.join(File.dirname(__FILE__), 'helper')
+require File.expand_path("../helper.rb", __FILE__)
 
 class TestZmqContext < ZmqTestCase
   def test_context
@@ -83,4 +83,4 @@ class TestZmqContext < ZmqTestCase
   ensure
     ctx.destroy
   end
-end
+end

data/test/test_frame.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.join(File.dirname(__FILE__), 'helper')
+require File.expand_path("../helper.rb", __FILE__)
 
 class TestZmqFrame < ZmqTestCase
   def test_alloc
@@ -74,4 +74,4 @@ class TestZmqFrame < ZmqTestCase
     frame.reset("msg")
     assert_equal "msg", frame.data
   end
-end
+end

data/test/test_handler.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.join(File.dirname(__FILE__), 'helper')
+require File.expand_path("../helper.rb", __FILE__)
 
 class TestZmqHandler < ZmqTestCase
   def test_expects_pollitem
@@ -25,4 +25,4 @@ class TestZmqHandler < ZmqTestCase
       handler.on_error(StandardError.new)
     end
   end
-end
+end

data/test/test_logger.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.join(File.dirname(__FILE__), 'helper')
+require File.expand_path("../helper.rb", __FILE__)
 
 class TestZmqLogger < ZmqTestCase
 

data/test/test_loop.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.join(File.dirname(__FILE__), 'helper')
+require File.expand_path("../helper.rb", __FILE__)
 
 class TestZmqLoop < ZmqTestCase
   def test_alloc
@@ -249,4 +249,4 @@ class TestZmqLoop < ZmqTestCase
   ensure
     ctx.destroy
   end
-end
+end

data/test/test_message.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.join(File.dirname(__FILE__), 'helper')
+require File.expand_path("../helper.rb", __FILE__)
 
 class TestZmqMessage < ZmqTestCase
   def test_message

data/test/test_monitoring.rb

@@ -1,9 +1,9 @@
 # encoding: utf-8
 
-require File.join(File.dirname(__FILE__), 'helper')
+require File.expand_path("../helper.rb", __FILE__)
 
 class TestMonitor
-  attr_reader :listening, :closed
+  attr_reader :listening, :closed, :accepted
 
   def on_listening(addr, fd)
     @listening = true
@@ -12,6 +12,14 @@ class TestMonitor
   def on_closed(addr, fd)
     @closed = true
   end
+
+  def on_accepted(addr, fd)
+    @accepted = true
+  end
+
+  def on_bind_failed(addr, fd)
+    @bind_failed = true
+  end
 end
 
 class TestZmqMonitoring < ZmqTestCase
@@ -31,9 +39,13 @@ class TestZmqMonitoring < ZmqTestCase
     assert !sock.monitor("tcp://0.0.0.0:5000")
     assert sock.monitor("inproc://monitor.rep", cb)
     sleep 1
-    sock.bind("tcp://0.0.0.0:5555")
+    port = sock.bind("tcp://127.0.0.1:*")
     sleep 1
     assert cb.listening
+    client = ctx.socket(:REQ)
+    client.connect("tcp://127.0.0.1:#{port}")
+    sleep 1
+    assert cb.accepted
     sock.close
     sleep 1
     assert cb.closed

data/test/test_poller.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.join(File.dirname(__FILE__), 'helper')
+require File.expand_path("../helper.rb", __FILE__)
 
 class TestZmqPoller < ZmqTestCase
 
@@ -151,4 +151,4 @@ class TestZmqPoller < ZmqTestCase
     poller = ZMQ::Poller.new
     assert_equal [], poller.writables
   end
-end
+end

data/test/test_pollitem.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.join(File.dirname(__FILE__), 'helper')
+require File.expand_path("../helper.rb", __FILE__)
 
 class TestZmqPollitem < ZmqTestCase
   def test_alloc_io
@@ -85,4 +85,4 @@ class TestZmqPollitem < ZmqTestCase
   ensure
     ctx.destroy
   end
-end
+end

data/test/test_socket.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.join(File.dirname(__FILE__), 'helper')
+require File.expand_path("../helper.rb", __FILE__)
 
 class TestZmqSocket < ZmqTestCase
   def test_recv_timeout
@@ -183,13 +183,13 @@ class TestZmqSocket < ZmqTestCase
     assert(req.state & ZMQ::Socket::PENDING)
     req.connect("tcp://127.0.0.1:#{port}")
     assert_equal "PAIR socket", sock.to_s
-    assert_equal "REP socket bound to tcp://127.0.0.1:*", rep.to_s
+    assert_equal "REP socket bound to tcp://127.0.0.1:#{port}", rep.to_s
     assert_equal "REQ socket connected to tcp://127.0.0.1:#{port}", req.to_s
 
 
     port2 = rep.bind("tcp://127.0.0.1:*")
     req.connect("tcp://127.0.0.1:#{port2}")
-    assert_equal "REP socket bound to tcp://127.0.0.1:*, tcp://127.0.0.1:*", rep.to_s
+    assert_equal "REP socket bound to tcp://127.0.0.1:#{port}, tcp://127.0.0.1:#{port2}", rep.to_s
     assert_equal "REQ socket connected to tcp://127.0.0.1:#{port}, tcp://127.0.0.1:#{port2}", req.to_s
   ensure
     ctx.destroy
@@ -201,7 +201,7 @@ class TestZmqSocket < ZmqTestCase
     port = rep.bind("tcp://127.0.0.1:*")
     req = ctx.socket(:REQ)
     req.connect("tcp://127.0.0.1:#{port}")
-    assert_equal "tcp://127.0.0.1:*", rep.endpoint
+    assert_equal "tcp://127.0.0.1:#{port}", rep.endpoint
     assert_equal "tcp://127.0.0.1:#{port}", req.endpoint
   ensure
     ctx.destroy
@@ -213,12 +213,12 @@ class TestZmqSocket < ZmqTestCase
     port = rep.bind("tcp://127.0.0.1:*")
     req = ctx.socket(:REQ)
     req.connect("tcp://127.0.0.1:#{port}")
-    assert_equal ["tcp://127.0.0.1:*"], rep.endpoints
+    assert_equal ["tcp://127.0.0.1:#{port}"], rep.endpoints
     assert_equal ["tcp://127.0.0.1:#{port}"], req.endpoints
 
     port2 = rep.bind("tcp://127.0.0.1:*")
     req.connect("tcp://127.0.0.1:#{port2}")
-    assert_equal ["tcp://127.0.0.1:*", "tcp://127.0.0.1:*"], rep.endpoints
+    assert_equal ["tcp://127.0.0.1:#{port}", "tcp://127.0.0.1:#{port2}"], rep.endpoints
     assert_equal ["tcp://127.0.0.1:#{port}", "tcp://127.0.0.1:#{port2}"], req.endpoints
   ensure
     ctx.destroy
@@ -558,4 +558,51 @@ end
   ensure
     ctx.destroy
   end
+
+  def test_last_endpoint
+    ctx = ZMQ::Context.new
+    sock = ctx.socket(ZMQ::PULL)
+    port = sock.bind('tcp://127.0.0.1:*')
+    assert_equal sock.last_endpoint, "tcp://127.0.0.1:#{port}"
+  ensure
+    ctx.destroy
+  end
+
+  def test_ephemeral_bind
+    ctx = ZMQ::Context.new
+    sock = ctx.socket(ZMQ::PULL)
+    port = sock.bind('tcp://127.0.0.1:*')
+    assert sock.endpoints.include?("tcp://127.0.0.1:#{port}")
+  ensure
+    ctx.destroy
+  end
+
+  def test_ephemral_bind_and_unbind
+    ctx = ZMQ::Context.new
+    sock = ctx.socket(ZMQ::PULL)
+    port = sock.bind('tcp://127.0.0.1:*')
+    sock.unbind("tcp://127.0.0.1:#{port}")
+    assert sock.endpoints.count == 0
+  ensure
+    ctx.destroy
+  end
+
+  def test_pollable_after_bind_and_unbind
+    ctx = ZMQ::Context.new
+    router = ctx.socket(ZMQ::ROUTER)
+    port1 = router.bind('tcp://127.0.0.1:*')
+    dealer = ctx.socket(ZMQ::DEALER)
+    dealer.connect(router.last_endpoint)
+    port2 = router.bind('tcp://127.0.0.1:*')
+    dealer.send("hello")
+    sleep(0.01)
+    assert_equal router.poll(0), true
+    router.unbind("tcp://127.0.0.1:#{port2}")
+    assert_equal router.poll(0), true
+    message = router.recv_message
+    assert_equal message.last.to_s, "hello"
+  ensure
+    ctx.destroy
+  end
+
 end

data/test/test_threading.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.join(File.dirname(__FILE__), 'helper')
+require File.expand_path("../helper.rb", __FILE__)
 
 Thread.abort_on_exception = true
 
@@ -31,4 +31,4 @@ class TestZmqThreading < ZmqTestCase
     thread_vals = [0, 1, 2, 3, 4, 500_000, 500_000, 500_000, 500_000, 500_000, expected, true]
     assert_equal thread_vals, threads
   end
-end
+end