aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--test/rexml/test_sax.rb35
2 files changed, 18 insertions, 21 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
-
- Thread.new{
- server = TCPServer.new('127.0.0.1', $port)
- while (session = server.accept)
- session << '<foo>'
- Thread.stop
+ port = 12345
+
+ 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