diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/ipv6_enabled.rb | 8 | ||||
| -rw-r--r-- | test/test_linux.rb | 5 | ||||
| -rw-r--r-- | test/test_linux_all_tcp_listen_stats_leak.rb | 4 | ||||
| -rw-r--r-- | test/test_raindrops.rb | 2 | ||||
| -rw-r--r-- | test/test_tcp_info.rb | 8 | ||||
| -rw-r--r-- | test/test_watcher.rb | 18 |
6 files changed, 23 insertions, 22 deletions
diff --git a/test/ipv6_enabled.rb b/test/ipv6_enabled.rb index f02b48f..c4c9709 100644 --- a/test/ipv6_enabled.rb +++ b/test/ipv6_enabled.rb @@ -2,8 +2,8 @@ def ipv6_enabled? tmp = TCPServer.new(ENV["TEST_HOST6"] || '::1', 0) tmp.close true - rescue => e - warn "skipping IPv6 tests, host does not seem to be IPv6 enabled:" - warn " #{e.class}: #{e}" - false +rescue => e + warn "skipping IPv6 tests, host does not seem to be IPv6 enabled:" + warn " #{e.class}: #{e}" + false end diff --git a/test/test_linux.rb b/test/test_linux.rb index bfefcc4..7808469 100644 --- a/test/test_linux.rb +++ b/test/test_linux.rb @@ -76,6 +76,7 @@ class TestLinux < Test::Unit::TestCase assert_equal 0, stats[tmp.path].active assert_equal 0, stats[tmp.path].queued + us.close end def test_unix_resolves_symlinks @@ -151,8 +152,8 @@ class TestLinux < Test::Unit::TestCase assert_equal 1, stats.size assert_equal 0, stats[addr].queued assert_equal 1, stats[addr].active - ensure - nlsock.close + ensure + nlsock.close end def test_tcp_multi diff --git a/test/test_linux_all_tcp_listen_stats_leak.rb b/test/test_linux_all_tcp_listen_stats_leak.rb index 7368220..7be46d4 100644 --- a/test/test_linux_all_tcp_listen_stats_leak.rb +++ b/test/test_linux_all_tcp_listen_stats_leak.rb @@ -37,7 +37,7 @@ class TestLinuxAllTcpListenStatsLeak < Test::Unit::TestCase end cur_kb = rss_kb p [ :cur_kb, cur_kb ] - ensure - s.close + ensure + s.close end end if ENV["STRESS"].to_i != 0 diff --git a/test/test_raindrops.rb b/test/test_raindrops.rb index 67089b7..0749694 100644 --- a/test/test_raindrops.rb +++ b/test/test_raindrops.rb @@ -134,7 +134,7 @@ class TestRaindrops < Test::Unit::TestCase assert_equal 0, rd[rd.capa - 1] assert_equal 1, rd.incr(rd.capa - 1) assert_raises(ArgumentError) { rd[rd.capa] } - rescue RangeError + rescue RangeError end # if RUBY_PLATFORM =~ /linux/ def test_evaporate diff --git a/test/test_tcp_info.rb b/test/test_tcp_info.rb index b107565..2ddacfd 100644 --- a/test/test_tcp_info.rb +++ b/test/test_tcp_info.rb @@ -60,10 +60,10 @@ class TestTCP_Info < Test::Unit::TestCase a = s.accept i = Raindrops::TCP_Info.new(a) assert i.last_data_recv >= delay_ms, "#{i.last_data_recv} < #{delay_ms}" - ensure - c.close if c - a.close if a - s.close + ensure + c.close if c + a.close if a + s.close end def test_tcp_server_state_closed diff --git a/test/test_watcher.rb b/test/test_watcher.rb index d1e4d15..28ac49b 100644 --- a/test/test_watcher.rb +++ b/test/test_watcher.rb @@ -118,28 +118,28 @@ class TestWatcher < Test::Unit::TestCase def test_x_current_header env = @req.class.env_for "/active/#@addr.txt" - status, headers, body = @app.call(env) + _status, headers, _body = @app.call(env) assert_equal "0", headers["X-Current"], headers.inspect env = @req.class.env_for "/queued/#@addr.txt" - status, headers, body = @app.call(env) + _status, headers, _body = @app.call(env) assert_equal "1", headers["X-Current"], headers.inspect @ios << @srv.accept sleep 0.1 env = @req.class.env_for "/queued/#@addr.txt" - status, headers, body = @app.call(env) + _status, headers, _body = @app.call(env) assert_equal "0", headers["X-Current"], headers.inspect env = @req.class.env_for "/active/#@addr.txt" - status, headers, body = @app.call(env) + _status, headers, _body = @app.call(env) assert_equal "1", headers["X-Current"], headers.inspect end def test_peaks env = @req.class.env_for "/active/#@addr.txt" - status, headers, body = @app.call(env.dup) + _status, headers, _body = @app.call(env.dup) start = headers["X-First-Peak-At"] assert headers["X-First-Peak-At"], headers.inspect assert headers["X-Last-Peak-At"], headers.inspect @@ -148,14 +148,14 @@ class TestWatcher < Test::Unit::TestCase before = headers["X-Last-Peak-At"] env = @req.class.env_for "/queued/#@addr.txt" - status, headers, body = @app.call(env) + _status, headers, _body = @app.call(env) assert_nothing_raised { Time.parse(headers["X-First-Peak-At"]) } assert_nothing_raised { Time.parse(headers["X-Last-Peak-At"]) } assert_equal before, headers["X-Last-Peak-At"], "should not change" sleep 2 env = @req.class.env_for "/active/#@addr.txt" - status, headers, body = @app.call(env.dup) + _status, headers, _body = @app.call(env.dup) assert_equal before, headers["X-Last-Peak-At"], headers.inspect @ios << @srv.accept @@ -167,7 +167,7 @@ class TestWatcher < Test::Unit::TestCase end sleep 0.1 env = @req.class.env_for "/queued/#@addr.txt" - status, headers, body = @app.call(env.dup) + _status, headers, _body = @app.call(env.dup) assert headers["X-Last-Peak-At"], headers.inspect assert_nothing_raised { Time.parse(headers["X-Last-Peak-At"]) } assert before != headers["X-Last-Peak-At"] @@ -177,7 +177,7 @@ class TestWatcher < Test::Unit::TestCase sleep 2 env = @req.class.env_for "/queued/#@addr.txt" - status, headers, body = @app.call(env) + _status, headers, _body = @app.call(env) assert_equal "0", headers["X-Current"] assert_nothing_raised { Time.parse(headers["X-Last-Peak-At"]) } assert_equal queued_before, headers["X-Last-Peak-At"], "should not change" |