sensu-em 2.4.1 → 2.5.0.beta

data/tests/test_processes.rb

@@ -37,8 +37,8 @@ class TestProcesses < Test::Unit::TestCase
       }
 
       assert( $out.length > 0 )
-      assert_equal($status.exitstatus, 0)
-      assert_equal($status.class, Process::Status)
+      assert_equal(0, $status.exitstatus)
+      assert_kind_of(Process::Status, $status)
     end
 
     def test_em_system_pid
@@ -57,8 +57,8 @@ class TestProcesses < Test::Unit::TestCase
       }
 
       assert( $out.length > 0 )
-      assert_equal($status.exitstatus, 0)
-      assert_equal($status.class, Process::Status)
+      assert_equal(0, $status.exitstatus)
+      assert_kind_of(Process::Status, $status)
     end
 
     def test_em_system_with_two_procs
@@ -111,9 +111,9 @@ class TestProcesses < Test::Unit::TestCase
         end
       end
 
-      EM.run{
-        EM.popen('cat /dev/random', test_client)
-      }
+      EM.run do
+        EM.popen('echo 1', test_client)
+      end
 
       assert_equal 1, c_rx
     end

data/tests/test_resolver.rb

@@ -30,11 +30,11 @@ class TestResolver < Test::Unit::TestCase
 
   def test_a_pair
     EM.run {
-      d = EM::DNS::Resolver.resolve "google.com"
-      d.errback { assert false }
+      d = EM::DNS::Resolver.resolve "yahoo.com"
+      d.errback { |err| assert false, "failed to resolve yahoo.com: #{err}" }
       d.callback { |r|
-        assert_equal(Array, r.class)
-        assert r.size > 1
+        assert_kind_of(Array, r)
+        assert r.size > 1, "returned #{r.size} results: #{r.inspect}"
         EM.stop
       }
     }
@@ -45,11 +45,37 @@ class TestResolver < Test::Unit::TestCase
       d = EM::DNS::Resolver.resolve "localhost"
       d.errback { assert false }
       d.callback { |r|
-        assert_equal("127.0.0.1", r.first)
-        assert_equal(Array, r.class)
+        assert_include(["127.0.0.1", "::1"], r.first)
+        assert_kind_of(Array, r)
+
+        EM.stop
+      }
+    }
+  end
+
+  def test_timer_cleanup
+    EM.run {
+      d = EM::DNS::Resolver.resolve "google.com"
+      d.errback { |err| assert false, "failed to resolve google.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
+        assert_nil(EM::DNS::Resolver.socket.instance_variable_get(:@timer))
+
+        EM.stop
+      }
+    }
+  end
+
+  def test_failure_timer_cleanup
+    EM.run {
+      d = EM::DNS::Resolver.resolve "asdfasdf"
+      d.callback { assert false }
+      d.errback {
+        assert_nil(EM::DNS::Resolver.socket.instance_variable_get(:@timer))
 
         EM.stop
       }
     }
   end
-end
+end

data/tests/test_ssl_methods.rb

@@ -8,7 +8,6 @@ class TestSSLMethods < Test::Unit::TestCase
   end
 
   module ServerHandler
-
     def post_init
       start_tls(:private_key_file => $dir+'server.key', :cert_chain_file => $dir+'server.crt', :verify_peer => true)
     end
@@ -24,7 +23,6 @@ class TestSSLMethods < Test::Unit::TestCase
   end
 
   module ClientHandler
-
     def post_init
       start_tls(:private_key_file => $dir+'client.key', :cert_chain_file => $dir+'client.crt')
     end
@@ -34,10 +32,11 @@ class TestSSLMethods < Test::Unit::TestCase
       $server_cert_value = get_peer_cert
       EM.stop_event_loop
     end
-
   end
 
   def test_ssl_methods
+    omit_unless(EM.ssl?)
+    omit_if(rbx?)
     $server_called_back, $client_called_back = false, false
     $server_cert_value, $client_cert_value = nil, nil
 
@@ -53,4 +52,4 @@ class TestSSLMethods < Test::Unit::TestCase
     assert_equal($client_cert_from_file, $client_cert_value.gsub("\r", ""))
   end
 
-end if EM.ssl?
+end

data/tests/test_ssl_verify.rb

@@ -1,82 +1,82 @@
 require 'em_test_helper'
 
-if EM.ssl?
-  class TestSslVerify < Test::Unit::TestCase
-    def setup
-      $dir = File.dirname(File.expand_path(__FILE__)) + '/'
-      $cert_from_file = File.read($dir+'client.crt')
-    end
+class TestSslVerify < Test::Unit::TestCase
+  def setup
+    $dir = File.dirname(File.expand_path(__FILE__)) + '/'
+    $cert_from_file = File.read($dir+'client.crt')
+  end
 
-    module Client
-      def connection_completed
-        start_tls(:private_key_file => $dir+'client.key', :cert_chain_file => $dir+'client.crt')
-      end
+  module Client
+    def connection_completed
+      start_tls(:private_key_file => $dir+'client.key', :cert_chain_file => $dir+'client.crt')
+    end
 
-      def ssl_handshake_completed
-        $client_handshake_completed = true
-        close_connection
-      end
+    def ssl_handshake_completed
+      $client_handshake_completed = true
+      close_connection
+    end
 
-      def unbind
-        EM.stop_event_loop
-      end
+    def unbind
+      EM.stop_event_loop
     end
+  end
 
-    module AcceptServer
-      def post_init
-        start_tls(:private_key_file => $dir+'server.key', :cert_chain_file => $dir+'server.crt', :verify_peer => true)
-      end
+  module AcceptServer
+    def post_init
+      start_tls(:private_key_file => $dir+'server.key', :cert_chain_file => $dir+'server.crt', :verify_peer => true)
+    end
 
-      def ssl_verify_peer(cert)
-        $cert_from_server = cert
-        true
-      end
+    def ssl_verify_peer(cert)
+      $cert_from_server = cert
+      true
+    end
 
-      def ssl_handshake_completed
-        $server_handshake_completed = true
-      end
+    def ssl_handshake_completed
+      $server_handshake_completed = true
     end
+  end
 
-    module DenyServer
-      def post_init
-        start_tls(:private_key_file => $dir+'server.key', :cert_chain_file => $dir+'server.crt', :verify_peer => true)
-      end
+  module DenyServer
+    def post_init
+      start_tls(:private_key_file => $dir+'server.key', :cert_chain_file => $dir+'server.crt', :verify_peer => true)
+    end
 
-      def ssl_verify_peer(cert)
-        $cert_from_server = cert
-        # Do not accept the peer. This should now cause the connection to shut down without the SSL handshake being completed.
-        false
-      end
+    def ssl_verify_peer(cert)
+      $cert_from_server = cert
+      # Do not accept the peer. This should now cause the connection to shut down without the SSL handshake being completed.
+      false
+    end
 
-      def ssl_handshake_completed
-        $server_handshake_completed = true
-      end
+    def ssl_handshake_completed
+      $server_handshake_completed = true
     end
+  end
 
-    def test_accept_server
-      $client_handshake_completed, $server_handshake_completed = false, false
-      EM.run {
-        EM.start_server("127.0.0.1", 16784, AcceptServer)
-        EM.connect("127.0.0.1", 16784, Client).instance_variable_get("@signature")
-      }
+  def test_accept_server
+    omit_unless(EM.ssl?)
+    omit_if(rbx?)
+    $client_handshake_completed, $server_handshake_completed = false, false
+    EM.run {
+      EM.start_server("127.0.0.1", 16784, AcceptServer)
+      EM.connect("127.0.0.1", 16784, Client).instance_variable_get("@signature")
+    }
 
-      assert_equal($cert_from_file, $cert_from_server.gsub("\r", ""))
-      assert($client_handshake_completed)
-      assert($server_handshake_completed)
-    end
+    assert_equal($cert_from_file, $cert_from_server.gsub("\r", ""))
+    assert($client_handshake_completed)
+    assert($server_handshake_completed)
+  end
 
-    def test_deny_server
-      $client_handshake_completed, $server_handshake_completed = false, false
-      EM.run {
-        EM.start_server("127.0.0.1", 16784, DenyServer)
-        EM.connect("127.0.0.1", 16784, Client)
-      }
+  def test_deny_server
+    omit_unless(EM.ssl?)
+    omit_if(rbx?)
+    $client_handshake_completed, $server_handshake_completed = false, false
+    EM.run {
+      EM.start_server("127.0.0.1", 16784, DenyServer)
+      EM.connect("127.0.0.1", 16784, Client)
+    }
 
-      assert_equal($cert_from_file, $cert_from_server.gsub("\r", ""))
-      assert(!$client_handshake_completed)
-      assert(!$server_handshake_completed)
-    end
+    assert_equal($cert_from_file, $cert_from_server.gsub("\r", ""))
+    assert(!$client_handshake_completed)
+    assert(!$server_handshake_completed)
   end
-else
-  warn "EM built without SSL support, skipping tests in #{__FILE__}"
 end

data/tests/test_threaded_resource.rb

@@ -15,6 +15,10 @@ class TestThreadedResource < Test::Unit::TestCase
 
   def test_dispatch_completion
     EM.run do
+      EM.add_timer(3) do
+        EM.stop
+        fail 'Resource dispatch timed out'
+      end
       completion = resource.dispatch do |o|
         o[:foo] = :bar
         :foo
@@ -23,6 +27,10 @@ class TestThreadedResource < Test::Unit::TestCase
         assert_equal :foo, result
         EM.stop
       end
+      completion.errback do |error|
+        EM.stop
+        fail "Unexpected error: #{error.message}"
+      end
     end
     assert_equal :bar, object[:foo]
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-em
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.5.0.beta
 platform: ruby
 authors:
 - Francis Cianfrocca
@@ -9,8 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-05-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -212,6 +226,7 @@ files:
 - tests/test_channel.rb
 - tests/test_completion.rb
 - tests/test_connection_count.rb
+- tests/test_connection_write.rb
 - tests/test_defer.rb
 - tests/test_deferrable.rb
 - tests/test_epoll.rb
@@ -231,6 +246,7 @@ files:
 - tests/test_line_protocol.rb
 - tests/test_ltp.rb
 - tests/test_ltp2.rb
+- tests/test_many_fds.rb
 - tests/test_next_tick.rb
 - tests/test_object_protocol.rb
 - tests/test_pause.rb
@@ -262,6 +278,7 @@ files:
 - tests/test_timers.rb
 - tests/test_ud.rb
 - tests/test_unbind_reason.rb
+- tmp/java/rubyeventmachine/.build
 homepage: http://rubyeventmachine.com
 licenses:
 - Ruby
@@ -286,9 +303,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: eventmachine
 rubygems_version: 2.2.2