eventmachine 1.2.1 → 1.2.2

data/tests/test_resolver.rb

@@ -20,7 +20,7 @@ class TestResolver < Test::Unit::TestCase
     pend('FIXME: this test is broken on Windows') if windows?
 
     EM.run {
-      d = EM::DNS::Resolver.resolve "google.com"
+      d = EM::DNS::Resolver.resolve "example.com"
       d.errback { assert false }
       d.callback { |r|
         assert r
@@ -45,6 +45,7 @@ class TestResolver < Test::Unit::TestCase
     }
   end
 
+  # There isn't a public DNS entry like 'example.com' with an A rrset
   def test_a_pair
     pend('FIXME: this test is broken on Windows') if windows?
 
@@ -78,8 +79,8 @@ class TestResolver < Test::Unit::TestCase
     pend('FIXME: this test is broken on Windows') if windows?
 
     EM.run {
-      d = EM::DNS::Resolver.resolve "google.com"
-      d.errback { |err| assert false, "failed to resolve google.com: #{err}" }
+      d = EM::DNS::Resolver.resolve "example.com"
+      d.errback { |err| assert false, "failed to resolve example.com: #{err}" }
       d.callback { |r|
         # This isn't a great test, but it's hard to get more canonical
         # confirmation that the timer is cancelled

data/tests/test_sock_opt.rb

@@ -0,0 +1,54 @@
+require 'em_test_helper'
+require 'socket'
+
+class TestSockOpt < Test::Unit::TestCase
+  def setup
+    assert(!EM.reactor_running?)
+    @port = next_port
+  end
+
+  def teardown
+    assert(!EM.reactor_running?)
+  end
+
+  def test_set_sock_opt
+    omit_if(windows?)
+    omit_if(!EM.respond_to?(:set_sock_opt))
+
+    val = nil
+    test_module = Module.new do
+      define_method :post_init do
+        val = set_sock_opt Socket::SOL_SOCKET, Socket::SO_BROADCAST, true
+        EM.stop
+      end
+    end
+
+    EM.run do
+      EM.start_server '127.0.0.1', @port
+      EM.connect '127.0.0.1', @port, test_module
+    end
+
+    assert_equal 0, val
+  end
+
+  def test_get_sock_opt
+    omit_if(windows?)
+    omit_if(!EM.respond_to?(:set_sock_opt))
+
+    val = nil
+    test_module = Module.new do
+      define_method :connection_completed do
+        val = get_sock_opt Socket::SOL_SOCKET, Socket::SO_ERROR
+        EM.stop
+      end
+    end
+
+    EM.run do
+      EM.start_server '127.0.0.1', @port
+      EM.connect '127.0.0.1', @port, test_module
+    end
+
+    assert_equal "\0\0\0\0", val
+  end
+
+end

data/tests/test_stomp.rb

@@ -9,19 +9,20 @@ class TestStomp < Test::Unit::TestCase
     size || str.size
   end
 
-  def test_content_length_in_bytes
-    connection = Object.new
-    connection.instance_eval do 
-      extend EM::P::Stomp
+  class TStomp
+    include EM::P::Stomp
 
-      def last_sent_content_length
-        @sent && Integer(@sent[CONTENT_LENGTH_REGEX, 1])
-      end
+    def last_sent_content_length
+      @sent && Integer(@sent[CONTENT_LENGTH_REGEX, 1])
+    end
 
-      def send_data(string)
-        @sent = string
-      end
+    def send_data(string)
+      @sent = string
     end
+  end
+
+  def test_content_length_in_bytes
+    connection = TStomp.new
 
     queue = "queue"
     failure_message = "header content-length is not the byte size of last sent body"

data/tests/test_unbind_reason.rb

@@ -1,5 +1,4 @@
 require 'em_test_helper'
-require 'socket'
 
 class TestUnbindReason < Test::Unit::TestCase
 
@@ -11,42 +10,31 @@ class TestUnbindReason < Test::Unit::TestCase
     end
   end
 
+  # RFC 5737 Address Blocks Reserved for Documentation
   def test_connect_timeout
-    error = nil
-    EM.run {
-      conn = EM.connect 'google.com', 81, Module.new{ |m|
-        m.send(:define_method, :unbind) do |reason|
-          error = reason
-          EM.stop
-        end
-      }
-      conn.pending_connect_timeout = TIMEOUT_INTERVAL
-    }
-    assert_equal Errno::ETIMEDOUT, error
+    conn = nil
+    EM.run do
+      conn = EM.connect '192.0.2.0', 80, StubConnection
+      conn.pending_connect_timeout = 1
+    end
+    assert_equal Errno::ETIMEDOUT, conn.error
   end
 
   def test_connect_refused
     pend('FIXME: this test is broken on Windows') if windows?
-
-    error = nil
-    EM.run {
-      EM.connect '127.0.0.1', 12388, Module.new{ |m|
-        m.send(:define_method, :unbind) do |reason|
-          error = reason
-          EM.stop
-        end
-      }
-    }
-    assert_equal Errno::ECONNREFUSED, error
+    conn = nil
+    EM.run do
+      conn = EM.connect '127.0.0.1', 12388, StubConnection
+    end
+    assert_equal Errno::ECONNREFUSED, conn.error
   end
 
   def test_optional_argument
     pend('FIXME: this test is broken on Windows') if windows?
-
     conn = nil
-    EM.run {
+    EM.run do
       conn = EM.connect '127.0.0.1', 12388, StubConnection
-    }
+    end
     assert_equal Errno::ECONNREFUSED, conn.error
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eventmachine
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Francis Cianfrocca
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2017-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -209,7 +209,6 @@ files:
 - tests/test_file_watch.rb
 - tests/test_fork.rb
 - tests/test_futures.rb
-- tests/test_get_sock_opt.rb
 - tests/test_handler_check.rb
 - tests/test_hc.rb
 - tests/test_httpclient.rb
@@ -239,10 +238,10 @@ files:
 - tests/test_sasl.rb
 - tests/test_send_file.rb
 - tests/test_servers.rb
-- tests/test_set_sock_opt.rb
 - tests/test_shutdown_hooks.rb
 - tests/test_smtpclient.rb
 - tests/test_smtpserver.rb
+- tests/test_sock_opt.rb
 - tests/test_spawn.rb
 - tests/test_ssl_args.rb
 - tests/test_ssl_dhparam.rb
@@ -323,7 +322,6 @@ test_files:
 - tests/test_file_watch.rb
 - tests/test_fork.rb
 - tests/test_futures.rb
-- tests/test_get_sock_opt.rb
 - tests/test_handler_check.rb
 - tests/test_hc.rb
 - tests/test_httpclient.rb
@@ -353,10 +351,10 @@ test_files:
 - tests/test_sasl.rb
 - tests/test_send_file.rb
 - tests/test_servers.rb
-- tests/test_set_sock_opt.rb
 - tests/test_shutdown_hooks.rb
 - tests/test_smtpclient.rb
 - tests/test_smtpserver.rb
+- tests/test_sock_opt.rb
 - tests/test_spawn.rb
 - tests/test_ssl_args.rb
 - tests/test_ssl_dhparam.rb

data/tests/test_get_sock_opt.rb

@@ -1,37 +0,0 @@
-require 'em_test_helper'
-require 'socket'
-
-class TestGetSockOpt < Test::Unit::TestCase
-
-  if EM.respond_to? :get_sock_opt
-    def setup
-      assert(!EM.reactor_running?)
-    end
-
-    def teardown
-      assert(!EM.reactor_running?)
-    end
-
-    #-------------------------------------
-
-    def test_get_sock_opt
-      test = self
-      EM.run do
-        EM.connect 'google.com', 80, Module.new {
-          define_method :connection_completed do
-            val = get_sock_opt Socket::SOL_SOCKET, Socket::SO_ERROR
-            test.assert_equal "\0\0\0\0", val
-            EM.stop
-          end
-        }
-      end
-    end
-  else
-    warn "EM.get_sock_opt not implemented, skipping tests in #{__FILE__}"
-
-    # Because some rubies will complain if a TestCase class has no tests
-    def test_em_get_sock_opt_unsupported
-      assert true
-    end
-  end
-end

data/tests/test_set_sock_opt.rb

@@ -1,39 +0,0 @@
-require 'em_test_helper'
-require 'socket'
-
-class TestSetSockOpt < Test::Unit::TestCase
-
-  if EM.respond_to? :set_sock_opt
-    def setup
-      assert(!EM.reactor_running?)
-    end
-
-    def teardown
-      assert(!EM.reactor_running?)
-    end
-
-    #-------------------------------------
-
-    def test_set_sock_opt
-      omit_if(windows?)
-
-      test = self
-      EM.run do
-        EM.connect 'google.com', 80, Module.new {
-          define_method :post_init do
-            val = set_sock_opt Socket::SOL_SOCKET, Socket::SO_BROADCAST, true
-            test.assert_equal 0, val
-            EM.stop
-          end
-        }
-      end
-    end
-  else
-    warn "EM.set_sock_opt not implemented, skipping tests in #{__FILE__}"
-
-    # Because some rubies will complain if a TestCase class has no tests
-    def test_em_set_sock_opt_unsupported
-      assert true
-    end
-  end
-end