eventmachine 0.12.2 → 0.12.4

data/tests/test_running.rb

@@ -1,4 +1,4 @@
-# $Id: test_running.rb 668 2008-01-04 23:00:34Z blackhedd $
+# $Id$
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/tests/test_sasl.rb

@@ -1,4 +1,4 @@
-# $Id: test_sasl.rb 720 2008-06-20 23:50:59Z francis $
+# $Id$
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/tests/test_send_file.rb

@@ -1,4 +1,4 @@
-# $Id: test_send_file.rb 668 2008-01-04 23:00:34Z blackhedd $
+# $Id$
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -37,6 +37,20 @@ class TestSendFile < Test::Unit::TestCase
 			close_connection_after_writing
 		end
 	end
+	
+	module TestClient
+	  def data_to(&blk)
+	    @data_to = blk
+    end
+    
+    def receive_data(data)
+      @data_to.call(data) if @data_to
+    end
+    
+    def unbind
+      EM.stop
+    end
+  end
 
 	TestHost = "0.0.0.0"
 	TestPort = 9055
@@ -54,17 +68,15 @@ class TestSendFile < Test::Unit::TestCase
 			f << ("A" * 5000)
 		}
 
-		data = nil
+		data = ''
 
 		EM.run {
 			EM.start_server TestHost, TestPort, TestModule
 			EM.add_timer(2) {EM.stop} # avoid hanging in case of error
-			EM.defer proc {
-				t = TCPSocket.new TestHost, TestPort
-				data = t.read
-			}, proc {
-				EM.stop
-			}
+			
+			EM.connect TestHost, TestPort, TestClient do |c|
+			  c.data_to { |d| data << d }
+		  end
 		}
 
 		assert_equal( "A" * 5000, data )
@@ -77,18 +89,16 @@ class TestSendFile < Test::Unit::TestCase
 			f << ("A" * 1000000)
 		}
 
-		data = nil
+		data = ''
 
-		assert_raise(RuntimeError) {
+		ex_class = RUBY_PLATFORM == 'java' ? NativeException : RuntimeError
+    assert_raise( ex_class ) {
 			EM.run {
 				EM.start_server TestHost, TestPort, TestModule
 				EM.add_timer(2) {EM.stop} # avoid hanging in case of error
-				EM.defer proc {
-					t = TCPSocket.new TestHost, TestPort
-					data = t.read
-				}, proc {
-					EM.stop
-				}
+  			EM.connect TestHost, TestPort, TestClient do |c|
+  			  c.data_to { |d| data << d }
+  		  end
 			}
 		}
 
@@ -117,17 +127,14 @@ class TestSendFile < Test::Unit::TestCase
 			f << ("A" * 1000)
 		}
 
-		data = nil
+		data = ''
 
 		EM.run {
 			EM.start_server TestHost, TestPort, StreamTestModule
 			EM.add_timer(2) {EM.stop} # avoid hanging in case of error
-			EM.defer proc {
-				t = TCPSocket.new TestHost, TestPort
-				data = t.read
-			}, proc {
-				EM.stop
-			}
+			EM.connect TestHost, TestPort, TestClient do |c|
+			  c.data_to { |d| data << d }
+		  end
 		}
 
 		assert_equal( "A" * 1000, data )
@@ -140,17 +147,14 @@ class TestSendFile < Test::Unit::TestCase
 			f << ("A" * 1000)
 		}
 
-		data = nil
+		data = ''
 
 		EM.run {
 			EM.start_server TestHost, TestPort, ChunkStreamTestModule
 			EM.add_timer(2) {EM.stop} # avoid hanging in case of error
-			EM.defer proc {
-				t = TCPSocket.new TestHost, TestPort
-				data = t.read
-			}, proc {
-				EM.stop
-			}
+			EM.connect TestHost, TestPort, TestClient do |c|
+			  c.data_to { |d| data << d }
+		  end
 		}
 
 		assert_equal( "3e8\r\n#{"A" * 1000}\r\n0\r\n\r\n", data )
@@ -168,37 +172,36 @@ class TestSendFile < Test::Unit::TestCase
 		end
 	end
 	def test_stream_bad_file
-		data = nil
+		data = ''
 		EM.run {
 			EM.start_server TestHost, TestPort, BadFileTestModule
 			EM.add_timer(2) {EM.stop} # avoid hanging in case of error
-			EM.defer proc {
-				t = TCPSocket.new TestHost, TestPort
-				data = t.read
-			}, proc {
-				EM.stop
-			}
+			EM.connect TestHost, TestPort, TestClient do |c|
+			  c.data_to { |d| data << d }
+		  end
 		}
 
 		assert_equal( "file not found", data )
 	end
 
 	def test_stream_large_file_data
+	  begin
+	    require 'fastfilereaderext'
+    rescue LoadError
+      return
+    end
 		File.open( TestFilename, "w" ) {|f|
 			f << ("A" * 10000)
 		}
 
-		data = nil
+		data = ''
 
 		EM.run {
 			EM.start_server TestHost, TestPort, StreamTestModule
 			EM.add_timer(2) {EM.stop} # avoid hanging in case of error
-			EM.defer proc {
-				t = TCPSocket.new TestHost, TestPort
-				data = t.read
-			}, proc {
-				EM.stop
-			}
+			EM.connect TestHost, TestPort, TestClient do |c|
+			  c.data_to { |d| data << d }
+		  end
 		}
 
 		assert_equal( "A" * 10000, data )
@@ -207,21 +210,23 @@ class TestSendFile < Test::Unit::TestCase
 	end
 
 	def test_stream_large_chunked_file_data
+	  begin
+	    require 'fastfilereaderext'
+    rescue LoadError
+      return
+    end
 		File.open( TestFilename, "w" ) {|f|
 			f << ("A" * 100000)
 		}
 
-		data = nil
+		data = ''
 
 		EM.run {
 			EM.start_server TestHost, TestPort, ChunkStreamTestModule
 			EM.add_timer(2) {EM.stop} # avoid hanging in case of error
-			EM.defer proc {
-				t = TCPSocket.new TestHost, TestPort
-				data = t.read
-			}, proc {
-				EM.stop
-			}
+			EM.connect TestHost, TestPort, TestClient do |c|
+			  c.data_to { |d| data << d }
+		  end
 		}
 
 		expected = [

data/tests/test_servers.rb

@@ -1,4 +1,4 @@
-# $Id: test_servers.rb 668 2008-01-04 23:00:34Z blackhedd $
+# $Id$
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -33,14 +33,18 @@ require 'test/unit'
 class TestServers < Test::Unit::TestCase
 
 	Host = "127.0.0.1"
-	Port = 9550
-
-	def setup
-	end
-
-	def teardown
-	end
-
+	Port = 9555
+	
+	module NetstatHelper
+	  GlobalUdp4Rexp = /udp.*\s+(?:\*|(?:0\.){3}0)[:.](\d+)\s/i
+	  GlobalTcp4Rexp = /tcp.*\s+(?:\*|(?:0\.){3}0)[:.](\d+)\s/i
+	  LocalUdpRexp = /udp.*\s+(?:127\.0\.0\.1|::1)[:.](\d+)\s/i
+	  LocalTcpRexp = /tcp.*\s+(?:127\.0\.0\.1|::1)[:.](\d+)\s/i
+	  def grep_netstat(pattern)
+	    `netstat -an`.scan(/^.*$/).grep(pattern)
+    end
+  end
+	include NetstatHelper
 
 	class TestStopServer < EM::Connection
 		def initialize *args
@@ -51,37 +55,23 @@ class TestServers < Test::Unit::TestCase
 			EM.stop_server @server_instance
 		end
 	end
+	
 	def run_test_stop_server
-		succeed = false
-		err = false
-		EM.run {
-			sig = EM.start_server(Host, Port)
-			EM.defer proc {
-				if TCPSocket.new Host, Port
-					succeed = true
-				end
-			}, proc {
-				EM.stop_server sig
-				EM.defer proc {
-					# Wait for the acceptor to die, otherwise
-					# we'll probably get a conn-reset instead
-					# of a conn-refused.
-					sleep 0.1
-					begin
-						TCPSocket.new Host, Port
-					rescue
-						err = $!
-					end
-				}, proc {
-					EM.stop
-				}
-			}
-		}
-		assert_equal( true, succeed )
-		assert_equal( Errno::ECONNREFUSED, err.class )
+	  EM.run {
+	    sig = EM.start_server(Host, Port)
+	    assert(grep_netstat(LocalTcpRexp).grep(%r(#{Port})).size >= 1, "Server didn't start")
+	    EM.stop_server sig
+	    # Give the server some time to shutdown.
+	    EM.add_timer(0.1) {
+    		assert(grep_netstat(LocalTcpRexp).grep(%r(#{Port})).empty?, "Servers didn't stop")  	    
+  	    EM.stop
+	    }
+	  }
 	end
 	def test_stop_server
+	  assert(grep_netstat(LocalTcpRexp).grep(Port).empty?, "Port already in use")
 		5.times {run_test_stop_server}
+		assert(grep_netstat(LocalTcpRexp).grep(%r(#{Port})).empty?, "Servers didn't stop")
 	end
 
 

data/tests/test_smtpclient.rb

@@ -1,4 +1,4 @@
-# $Id: test_smtpclient.rb 668 2008-01-04 23:00:34Z blackhedd $
+# $Id$
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -30,52 +30,54 @@ require 'test/unit'
 
 class TestSmtpClient < Test::Unit::TestCase
 
-	Localhost = "127.0.0.1"
-	Localport = 9801
+  Localhost = "127.0.0.1"
+  Localport = 9801
 
-	def setup
-	end
+  def setup
+  end
 
-	def teardown
-	end
+  def teardown
+  end
 
-	def test_a
-		# No real tests until we have a server implementation to test against.
-		# This is what the call looks like, though:
+  def test_a
+    # No real tests until we have a server implementation to test against.
+    # This is what the call looks like, though:
+    err = nil
+    EM.run {
+      d = EM::Protocols::SmtpClient.send :domain=>"example.com",
+      :host=>Localhost,
+      :port=>Localport, # optional, defaults 25
+      :starttls=>true,
+      :from=>"sender@example.com",
+      :to=> ["to_1@example.com", "to_2@example.com"],
+      :header=> {"Subject" => "This is a subject line"},
+      :body=> "This is the body of the email",
+      :verbose=>true
+      d.errback {|e|
+        err = e
+        EM.stop
+      }
+    }
+    assert(err)
+  end
 
-		EM.run {
-			d = EM::Protocols::SmtpClient.send :domain=>"example.com",
-				:host=>Localhost,
-				:port=>Localport, # optional, defaults 25
-				:starttls=>true,
-				:from=>"sender@example.com",
-				:to=> ["to_1@example.com", "to_2@example.com"],
-				:header=> {"Subject" => "This is a subject line"},
-				:body=> "This is the body of the email",
-				:verbose=>true
-			d.errback {|e|
-				p e
-				EM.stop
-			}
-		}
-	end
-
-	def test_content
-
-		EM.run {
-			d = EM::Protocols::SmtpClient.send :domain=>"example.com",
-				:host=>Localhost,
-				:port=>Localport, # optional, defaults 25
-				:starttls=>true,
-				:from=>"sender@example.com",
-				:to=> ["to_1@example.com", "to_2@example.com"],
-				:content => ["Subject: xxx\r\n\r\ndata\r\n.\r\n"],
-				:verbose=>true
-			d.errback {|e|
-				p e
-				EM.stop
-			}
-		}
-	end
+  def test_content
+    err = nil
+    EM.run {
+      d = EM::Protocols::SmtpClient.send :domain=>"example.com",
+      :host=>Localhost,
+      :port=>Localport, # optional, defaults 25
+      :starttls=>true,
+      :from=>"sender@example.com",
+      :to=> ["to_1@example.com", "to_2@example.com"],
+      :content => ["Subject: xxx\r\n\r\ndata\r\n.\r\n"],
+      :verbose=>true
+      d.errback {|e|
+        err = e
+        EM.stop
+      }
+    }
+    assert(err)
+  end
 
 end

data/tests/test_smtpserver.rb

@@ -1,4 +1,4 @@
-# $Id: test_smtpserver.rb 668 2008-01-04 23:00:34Z blackhedd $
+# $Id$
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/tests/test_spawn.rb

@@ -1,4 +1,4 @@
-# $Id: test_spawn.rb 668 2008-01-04 23:00:34Z blackhedd $
+# $Id$
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/tests/test_ssl_args.rb

@@ -0,0 +1,68 @@
+require "test/unit"
+require 'tempfile'
+
+$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+require "eventmachine"
+
+module EventMachine
+  def self._set_mocks
+    class <<self
+      alias set_tls_parms_old set_tls_parms
+      alias start_tls_old start_tls
+      def set_tls_parms *args; end
+      def start_tls *args; end
+    end
+  end
+  
+  def self._clear_mocks
+    class <<self
+      alias set_tls_parms set_tls_parms_old
+      alias start_tls start_tls_old
+    end
+  end
+end
+  
+
+class TestSslArgs < Test::Unit::TestCase
+  def setup
+    EventMachine._set_mocks
+  end
+  
+  def teardown
+    EventMachine._clear_mocks
+  end
+  
+  def test_tls_params_file_doesnt_exist
+    priv_file, cert_file = 'foo_priv_key', 'bar_cert_file'
+    [priv_file, cert_file].all? do |f|
+      assert(!File.exists?(f), "Cert file #{f} seems to exist, and should not for the tests")
+    end
+    
+    # associate_callback_target is a pain! (build!)
+    conn = EventMachine::Connection.new('foo')
+    
+    assert_raise(EventMachine::FileNotFoundException) do
+      conn.start_tls(:private_key_file => priv_file)
+    end
+    assert_raise(EventMachine::FileNotFoundException) do
+      conn.start_tls(:cert_chain_file => cert_file)
+    end
+    assert_raise(EventMachine::FileNotFoundException) do
+      conn.start_tls(:private_key_file => priv_file, :cert_chain_file => cert_file)
+    end
+  end
+  
+  def test_tls_params_file_does_exist
+    priv_file = Tempfile.new('em_test')
+    cert_file = Tempfile.new('em_test')
+    priv_file_path = priv_file.path
+    cert_file_path = cert_file.path
+    conn = EventMachine::Connection.new('foo')
+    params = {:private_key_file => priv_file_path, :cert_chain_file => cert_file_path}
+    begin
+      conn.start_tls params
+    rescue Object
+      assert(false, 'should not have raised an exception')
+    end
+  end
+end