test/test_linux_ipv6.rb in raindrops-0.6.1 vs test/test_linux_ipv6.rb in raindrops-0.7.0
- old
+ new
@@ -20,17 +20,17 @@
stats = tcp_listener_stats(addrs)
assert_equal 1, stats.size
assert_equal 0, stats[addr].queued
assert_equal 0, stats[addr].active
- c = TCPSocket.new(TEST_ADDR, port)
+ @to_close << TCPSocket.new(TEST_ADDR, port)
stats = tcp_listener_stats(addrs)
assert_equal 1, stats.size
assert_equal 1, stats[addr].queued
assert_equal 0, stats[addr].active
- sc = s.accept
+ @to_close << s.accept
stats = tcp_listener_stats(addrs)
assert_equal 1, stats.size
assert_equal 0, stats[addr].queued
assert_equal 1, stats[addr].active
end
@@ -46,11 +46,11 @@
assert_equal 0, stats[addr1].queued
assert_equal 0, stats[addr1].active
assert_equal 0, stats[addr2].queued
assert_equal 0, stats[addr2].active
- c1 = TCPSocket.new(TEST_ADDR, port1)
+ @to_close << TCPSocket.new(TEST_ADDR, port1)
stats = tcp_listener_stats(addrs)
assert_equal 2, stats.size
assert_equal 1, stats[addr1].queued
assert_equal 0, stats[addr1].active
assert_equal 0, stats[addr2].queued
@@ -62,27 +62,27 @@
assert_equal 0, stats[addr1].queued
assert_equal 1, stats[addr1].active
assert_equal 0, stats[addr2].queued
assert_equal 0, stats[addr2].active
- c2 = TCPSocket.new(TEST_ADDR, port2)
+ @to_close << TCPSocket.new(TEST_ADDR, port2)
stats = tcp_listener_stats(addrs)
assert_equal 2, stats.size
assert_equal 0, stats[addr1].queued
assert_equal 1, stats[addr1].active
assert_equal 1, stats[addr2].queued
assert_equal 0, stats[addr2].active
- c3 = TCPSocket.new(TEST_ADDR, port2)
+ @to_close << TCPSocket.new(TEST_ADDR, port2)
stats = tcp_listener_stats(addrs)
assert_equal 2, stats.size
assert_equal 0, stats[addr1].queued
assert_equal 1, stats[addr1].active
assert_equal 2, stats[addr2].queued
assert_equal 0, stats[addr2].active
- sc2 = s2.accept
+ @to_close << s2.accept
stats = tcp_listener_stats(addrs)
assert_equal 2, stats.size
assert_equal 0, stats[addr1].queued
assert_equal 1, stats[addr1].active
assert_equal 1, stats[addr2].queued
@@ -114,22 +114,22 @@
nr_proc.times do
fork do
rda.close
wrb.close
- socks = (1..nr_sock).map { s.accept }
+ @to_close.concat((1..nr_sock).map { s.accept })
wra.syswrite('.')
wra.close
rdb.sysread(1) # wait for parent to nuke us
end
end
nr_proc.times do
fork do
rda.close
wrb.close
- socks = (1..nr_sock).map { TCPSocket.new(TEST_ADDR, port) }
+ @to_close.concat((1..nr_sock).map { TCPSocket.new(TEST_ADDR, port) })
wra.syswrite('.')
wra.close
rdb.sysread(1) # wait for parent to nuke us
end
end
@@ -139,11 +139,11 @@
rda.close
stats = tcp_listener_stats(addrs)
expect = { addr => Raindrops::ListenStats[nr_sock * nr_proc, 0] }
assert_equal expect, stats
- uno_mas = TCPSocket.new(TEST_ADDR, port)
+ @to_close << TCPSocket.new(TEST_ADDR, port)
stats = tcp_listener_stats(addrs)
expect = { addr => Raindrops::ListenStats[nr_sock * nr_proc, 1] }
assert_equal expect, stats
if ENV["BENCHMARK"].to_i != 0
@@ -151,8 +151,8 @@
puts(Benchmark.measure{1000.times { tcp_listener_stats(addrs) }})
end
wrb.syswrite('.' * (nr_proc * 2)) # broadcast a wakeup
statuses = Process.waitall
- statuses.each { |(pid,status)| assert status.success?, status.inspect }
+ statuses.each { |(_,status)| assert status.success?, status.inspect }
end if ENV["STRESS"].to_i != 0
end if RUBY_PLATFORM =~ /linux/ && ipv6_enabled?