From 7bf12316a1716c2116908c494e9e259dc39eb8a5 Mon Sep 17 00:00:00 2001
From: kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 17 Sep 2010 14:23:56 +0000
Subject: [PATCH] * test/rexml/test_sax.rb: don't use thread and sleep to avoid
 slow test.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29287 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog              |  4 ++++
 test/rexml/test_sax.rb | 33 +++++++++++++--------------------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 21208a67fb..725ce97ca4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Sep 17 23:23:26 2010  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_sax.rb: don't use thread and sleep to avoid slow test.
+
 Fri Sep 17 23:10:44 2010  Kouhei Sutou  <kou@cozmixng.org>
 
 	* test/rexml/test_core.rb: enable.
diff --git a/test/rexml/test_sax.rb b/test/rexml/test_sax.rb
index e93ce8d1e7..c5ac21ca3d 100644
--- a/test/rexml/test_sax.rb
+++ b/test/rexml/test_sax.rb
@@ -221,29 +221,22 @@ class SAX2Tester < Test::Unit::TestCase
   def test_socket
     require 'socket'
 
-    $port = 12345
+    port = 12345
 
-    Thread.new{
-      server = TCPServer.new('127.0.0.1', $port)
-      while (session = server.accept)
-        session << '<foo>'
-        Thread.stop
+    server = TCPServer.new('127.0.0.1', port)
+    socket = TCPSocket.new('127.0.0.1', port)
+
+    ok = false
+    session = server.accept
+    session << '<foo>'
+    parser = REXML::Parsers::SAX2Parser.new(socket)
+    Fiber.new do
+      parser.listen(:start_element) do
+        ok = true
+        Fiber.yield
       end
-    }
-    sleep 1 #to be sure that server is running
-    @socket = TCPSocket.new('127.0.0.1',$port)
-
-    ok = false  
-
-    test = Thread.new{
-      parser = REXML::Parsers::SAX2Parser.new @socket
-      parser.listen( :start_element ) {
-        ok = true 
-      }
       parser.parse
-      Thread.stop
-    }
-    sleep 1 #to be sure that server is running
+    end.resume
     assert(ok)
   end