Changeset 607

Timestamp:

12/05/07 10:10:44 (1 year ago)

Author:

blackhedd

Message:

fixed bug: connection completed was getting called even with failed TCP connect attempts.

Files:

• version_0/lib/pr_eventmachine.rb (modified) (4 diffs)
• version_0/tests/test_pure.rb (modified) (1 diff)

version_0/lib/pr_eventmachine.rb

@@ -178 +178 @@
-
-    # #get_outbound_data_size
+    #
-    def get_outbound_data_size sig
-      r = Reactor.instance.get_selectable( sig ) or raise "unknown get_outbound_data_size target"
@@ -183 +184 @@
-    end
-
+    # #set_comm_inactivity_timeout
+    #
+    def set_comm_inactivity_timeout sig, tm
+      r = Reactor.instance.get_selectable( sig ) or raise "unknown set_comm_inactivity_timeout target"
+      p "?????????????" # TODO, IMPLEMENT THIS.
+    end
-  end
-
@@ -479 +486 @@
-      rescue Errno::EAGAIN
-        # no-op
-
+rrno::ECONNREFUSED, E
-        @close_scheduled = true
-        EventMachine::event_callback uuid, ConnectionUnbound, nil
@@ -594 +601 @@
-      if @pending
-        @pending = false
-
+
+
+
-      else
-        super

version_0/tests/test_pure.rb

@@ -71 +71 @@
-
-
+
+  # Under some circumstances, the pure Ruby library would emit an Errno::ECONNREFUSED
+  # exception on certain kinds of TCP connect-errors.
+  # It's always been something of an open question whether EM should throw an exception
+  # in these cases but the defined answer has always been to catch it the unbind method.
+  # With a connect failure, the latter will always fire, but connection_completed will
+  # never fire. So even though the point is arguable, it's incorrect for the pure Ruby
+  # version to throw an exception.
+  module TestConnrefused
+    def unbind
+      EM.stop
+    end
+    def connection_completed
+      raise "should never get here"
+    end
+  end
+  def test_connrefused
+    EM.run {
+      EM.connect "0.0.0.0", 60001, TestConnrefused
+    }
+  end
+
+
+  # Make sure connection_completed gets called as expected with TCP clients. This is the
+  # opposite of test_connrefused.
+  # If the test fails, it will hang because EM.stop never gets called.
+  #
+  module TestConnaccepted
+    def connection_completed
+      EM.stop
+    end
+  end
+  def test_connaccepted
+    timeout = false
+    EM.run {
+      EM.start_server "0.0.0.0", 60002
+      EM.connect "0.0.0.0", 60002, TestConnaccepted
+      EM::Timer.new(1) {timeout = true; EM.stop}
+    }
+    assert_equal( false, timeout )
+  end
+
-end