diff options
author | Eric Wong <normalperson@yhbt.net> | 2011-05-19 16:38:47 -0700 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2011-05-19 16:38:47 -0700 |
commit | d4349fce53e8ced815cb94b5e5397ff8dbf497d5 (patch) | |
tree | cb0e1caa78f864bccc9e6ee4fb7c5be1b3756b99 | |
parent | 400bd0afa9f99ad657065060db50df65b843030d (diff) | |
download | sleepy_penguin-d4349fce53e8ced815cb94b5e5397ff8dbf497d5.tar.gz |
-rw-r--r-- | test/test_epoll.rb | 6 | ||||
-rw-r--r-- | test/test_epoll_gc.rb | 2 | ||||
-rw-r--r-- | test/test_epoll_optimizations.rb | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/test/test_epoll.rb b/test/test_epoll.rb index e3e901c..15358da 100644 --- a/test/test_epoll.rb +++ b/test/test_epoll.rb @@ -63,7 +63,7 @@ class TestEpoll < Test::Unit::TestCase exit!(1) } res = Process.waitall - res.each { |(pid,status)| assert status.success? } + res.each { |(_,status)| assert status.success? } end def test_tcp_connect_nonblock_edge @@ -217,7 +217,7 @@ class TestEpoll < Test::Unit::TestCase assert_nothing_raised do 4096.times do ep = Epoll.new - io = ep.to_io + assert_kind_of IO, ep.to_io end end assert ! @ep.closed? @@ -300,7 +300,6 @@ class TestEpoll < Test::Unit::TestCase break end while true @ep.add(@wr, Epoll::OUT | Epoll::IN) - i = 0 assert_equal 0, @ep.wait(nil, 0) { |flags,event| assert false } end @@ -396,5 +395,6 @@ class TestEpoll < Test::Unit::TestCase assert_raises(IOError) do @ep.wait { |flags, obj| tmp << [ flags, obj ] } end + assert_nil thr.value end if RUBY_VERSION == "1.9.3" end diff --git a/test/test_epoll_gc.rb b/test/test_epoll_gc.rb index c00545d..b0a1868 100644 --- a/test/test_epoll_gc.rb +++ b/test/test_epoll_gc.rb @@ -21,7 +21,7 @@ class TestEpollGC < Test::Unit::TestCase def add_pipe(m, depth = 0) if depth > 6000 - rd, wr = IO.pipe + _, wr = IO.pipe warn "wr: #{wr.fileno}" @ep.__send__(m, wr, Epoll::OUT) else diff --git a/test/test_epoll_optimizations.rb b/test/test_epoll_optimizations.rb index 0c344b9..bd77397 100644 --- a/test/test_epoll_optimizations.rb +++ b/test/test_epoll_optimizations.rb @@ -29,19 +29,19 @@ class TestEpollOptimizations < Test::Unit::TestCase assert_nil err lines = io.readlines; io.close assert_equal 1, lines.grep(/^epoll_ctl/).size - assert_match /EPOLL_CTL_ADD/, lines.grep(/^epoll_ctl/)[0] + assert_match(/EPOLL_CTL_ADD/, lines.grep(/^epoll_ctl/)[0]) io, err = Strace.me { @ep.set(@wr, Epoll::OUT | Epoll::ONESHOT) } assert_nil err lines = io.readlines; io.close assert_equal 1, lines.grep(/^epoll_ctl/).size - assert_match /EPOLL_CTL_MOD/, lines.grep(/^epoll_ctl/)[0] + assert_match(/EPOLL_CTL_MOD/, lines.grep(/^epoll_ctl/)[0]) io, err = Strace.me { @ep.set(@wr, Epoll::OUT) } assert_nil err lines = io.readlines; io.close assert_equal 1, lines.grep(/^epoll_ctl/).size - assert_match /EPOLL_CTL_MOD/, lines.grep(/^epoll_ctl/)[0] + assert_match(/EPOLL_CTL_MOD/, lines.grep(/^epoll_ctl/)[0]) @wr.close @rd.close @@ -50,7 +50,7 @@ class TestEpollOptimizations < Test::Unit::TestCase assert_nil err lines = io.readlines; io.close assert_equal 1, lines.grep(/^epoll_ctl/).size - assert_match /EPOLL_CTL_ADD/, lines.grep(/^epoll_ctl/)[0] + assert_match(/EPOLL_CTL_ADD/, lines.grep(/^epoll_ctl/)[0]) end def test_delete @@ -61,7 +61,7 @@ class TestEpollOptimizations < Test::Unit::TestCase assert_nil err lines = io.readlines; io.close assert_equal 1, lines.grep(/^epoll_ctl/).size - assert_match %r{=\s+0$}, lines.grep(/^epoll_ctl/)[0] + assert_match(%r{=\s+0$}, lines.grep(/^epoll_ctl/)[0]) rv = true io, err = Strace.me { rv = @ep.delete(@wr) } @@ -122,7 +122,7 @@ class TestEpollOptimizations < Test::Unit::TestCase assert_equal tmp, rv assert_nil err assert_equal 1, lines.grep(/^epoll_ctl/).size - assert_match %r{=\s+0$}, lines.grep(/^epoll_ctl/)[0] + assert_match(%r{=\s+0$}, lines.grep(/^epoll_ctl/)[0]) assert_equal 0, lines.grep(/ENOENT/).size end |