From 5c804c89093378c67db56474ce1da1a0e0f08a7d Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 17 Jun 2010 06:41:36 +0000 Subject: tests: reenable more tests for rbx As of rbx commit cf4a5a759234faa3f7d8a92d68fa89d8c5048f72, most of the issues uncovered in our test suite are fixed. --- test/exec/test_exec.rb | 6 +----- test/unit/test_signals.rb | 2 +- test/unit/test_socket_helper.rb | 6 +++--- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/test/exec/test_exec.rb b/test/exec/test_exec.rb index a42e0ac..9830683 100644 --- a/test/exec/test_exec.rb +++ b/test/exec/test_exec.rb @@ -20,10 +20,6 @@ unless try_require('rack') do_test = false end -if ENV['RBX_SKIP'] - do_test = false -end - class ExecTest < Test::Unit::TestCase trap(:QUIT, 'IGNORE') @@ -613,7 +609,7 @@ EOF results = retry_hit(["http://#{@addr}:#{@port}/"]) assert_equal String, results[0].class assert_shutdown(pid) - end + end unless ENV['RBX_SKIP'] def test_config_ru_alt_path config_path = "#{@tmpdir}/foo.ru" diff --git a/test/unit/test_signals.rb b/test/unit/test_signals.rb index 825e871..7c78b44 100644 --- a/test/unit/test_signals.rb +++ b/test/unit/test_signals.rb @@ -201,6 +201,6 @@ class SignalsTest < Test::Unit::TestCase assert size_before < @tmp.stat.size assert_equal pid, sock.sysread(4096)[/\r\nX-Pid: (\d+)\r\n/, 1].to_i sock.close - end unless ENV['RBX_SKIP'] + end end diff --git a/test/unit/test_socket_helper.rb b/test/unit/test_socket_helper.rb index 7351c3a..36b2dc2 100644 --- a/test/unit/test_socket_helper.rb +++ b/test/unit/test_socket_helper.rb @@ -97,7 +97,7 @@ class TestSocketHelper < Test::Unit::TestCase a = bind_listen(tcp_server) assert_equal a.fileno, tcp_server.fileno assert_equal a.fileno, @tcp_listener.fileno - end unless ENV["RBX_SKIP"] + end def test_bind_listen_unix_rebind test_bind_listen_unix @@ -139,11 +139,11 @@ class TestSocketHelper < Test::Unit::TestCase assert_equal @tcp_listener.fileno, @tcp_server.fileno assert TCPServer === @tcp_server assert_equal @tcp_listener_name, sock_name(@tcp_server) - end unless ENV["RBX_SKIP"] + end def test_sock_name test_server_cast sock_name(@unix_server) - end unless ENV["RBX_SKIP"] + end end -- cgit v1.2.3-24-ge0c7