summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2010-06-08 07:03:35 +0000
committerEric Wong <normalperson@yhbt.net>2010-06-08 07:53:17 +0000
commit8b7b52c08ad5a4822c3ea1550c9fccd838696db2 (patch)
tree5f453e4d5b6793ad76b4616603f17993105e7404
parent2760d1e0d459a8e92eadf78cdf9f09d6a3109003 (diff)
They cannot be worked around, but tickets have been filed
upstream (I still hate all bug trackers besides Debian's).

TCPServer.for_fd (needed for zero-downtime upgrades):
  http://github.com/evanphx/rubinius/issues/354

UnixServer.for_fd (needed for zero-downtime upgrades):
  http://github.com/evanphx/rubinius/issues/355

Signal handling behavior seems broken (OOM or segfaults):
  http://github.com/evanphx/rubinius/issues/356
-rw-r--r--test/exec/test_exec.rb4
-rw-r--r--test/unit/test_signals.rb4
-rw-r--r--test/unit/test_socket_helper.rb6
3 files changed, 9 insertions, 5 deletions
diff --git a/test/exec/test_exec.rb b/test/exec/test_exec.rb
index a51f36d..a42e0ac 100644
--- a/test/exec/test_exec.rb
+++ b/test/exec/test_exec.rb
@@ -20,6 +20,10 @@ unless try_require('rack')
   do_test = false
 end
 
+if ENV['RBX_SKIP']
+  do_test = false
+end
+
 class ExecTest < Test::Unit::TestCase
   trap(:QUIT, 'IGNORE')
 
diff --git a/test/unit/test_signals.rb b/test/unit/test_signals.rb
index 71cf8f4..825e871 100644
--- a/test/unit/test_signals.rb
+++ b/test/unit/test_signals.rb
@@ -166,7 +166,7 @@ class SignalsTest < Test::Unit::TestCase
     expect = @bs * @count
     assert_equal(expect, got, "expect=#{expect} got=#{got}")
     assert_nothing_raised { sock.close }
-  end
+  end unless ENV['RBX_SKIP']
 
   def test_request_read
     app = lambda { |env|
@@ -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
+  end unless ENV['RBX_SKIP']
 
 end
diff --git a/test/unit/test_socket_helper.rb b/test/unit/test_socket_helper.rb
index 36b2dc2..7351c3a 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
+  end unless ENV["RBX_SKIP"]
 
   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
+  end unless ENV["RBX_SKIP"]
 
   def test_sock_name
     test_server_cast
     sock_name(@unix_server)
-  end
+  end unless ENV["RBX_SKIP"]
 
 end