summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--test/io/wait/test_io_wait.rb10
2 files changed, 5 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 5712c75c69..636e990d28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
-Sat May 7 23:56:56 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Sun May 8 00:13:05 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
- * test/io/wait/test_io_wait.rb: skip tests if the platform is
- mswin.
+ * test/io/wait/test_io_wait.rb: use Socket.pair instaed of pipe.
+ Windows can only treat a socket.
Sat May 7 22:43:48 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
diff --git a/test/io/wait/test_io_wait.rb b/test/io/wait/test_io_wait.rb
index 53b200148e..66d01907a6 100644
--- a/test/io/wait/test_io_wait.rb
+++ b/test/io/wait/test_io_wait.rb
@@ -1,5 +1,6 @@
require 'test/unit'
require 'timeout'
+require 'socket'
begin
require 'io/wait'
rescue LoadError
@@ -8,7 +9,7 @@ end
class TestIOWait < Test::Unit::TestCase
def setup
- @r, @w = IO.pipe
+ @r, @w = Socket.pair(Socket::AF_INET, Socket::SOCK_STREAM, 0)
end
def teardown
@@ -17,21 +18,18 @@ class TestIOWait < Test::Unit::TestCase
end
def test_nread
- return if /mswin/ =~ RUBY_PLATFORM
assert_equal 0, @r.nread
@w.syswrite "."
assert_equal 1, @r.nread
end
def test_nread_buffered
- return if /mswin/ =~ RUBY_PLATFORM
@w.syswrite ".\n!"
assert_equal ".\n", @r.read(2)
assert_equal 1, @r.nread
end
def test_ready?
- return if /mswin/ =~ RUBY_PLATFORM
refute @r.ready?
@w.syswrite "."
assert @r.ready?
@@ -44,27 +42,23 @@ class TestIOWait < Test::Unit::TestCase
end
def test_wait
- return if /mswin/ =~ RUBY_PLATFORM
assert_nil @r.wait(0)
@w.syswrite "."
assert_equal @r, @r.wait(0)
end
def test_wait_buffered
- return if /mswin/ =~ RUBY_PLATFORM
@w.syswrite ".\n!"
assert_equal ".\n", @r.gets
assert_equal true, @r.wait(0)
end
def test_wait_forever
- return if /mswin/ =~ RUBY_PLATFORM
Thread.new { sleep 0.01; @w.syswrite "." }
assert_equal @r, @r.wait
end
def test_wait_eof
- return if /mswin/ =~ RUBY_PLATFORM
Thread.new { sleep 0.01; @w.close }
assert_nil @r.wait
end