diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/helper.rb | 2 | ||||
| -rw-r--r-- | test/server_helper.rb | 4 | ||||
| -rw-r--r-- | test/test_serve_static.rb | 1 | ||||
| -rw-r--r-- | test/test_server.rb | 3 | ||||
| -rw-r--r-- | test/test_unix_socket.rb | 4 | ||||
| -rw-r--r-- | test/test_wbuf.rb | 2 |
6 files changed, 4 insertions, 12 deletions
diff --git a/test/helper.rb b/test/helper.rb index 3023dee..550a0f1 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -125,7 +125,7 @@ class IO end if ! IO.method_defined?(:nread) && RUBY_PLATFORM =~ /linux/ def cloexec_pipe - IO.pipe.each { |io| io.close_on_exec = true } + IO.pipe end def require_exec(cmd) diff --git a/test/server_helper.rb b/test/server_helper.rb index b794ee6..095cba1 100644 --- a/test/server_helper.rb +++ b/test/server_helper.rb @@ -52,9 +52,7 @@ module ServerHelper # only use for newly bound sockets def get_tcp_client(host, port, tries = 500) begin - c = TCPSocket.new(host, port) - c.close_on_exec = true - return c + return TCPSocket.new(host, port) rescue Errno::ECONNREFUSED raise if tries < 0 tries -= 1 diff --git a/test/test_serve_static.rb b/test/test_serve_static.rb index 68e84f7..837414b 100644 --- a/test/test_serve_static.rb +++ b/test/test_serve_static.rb @@ -38,7 +38,6 @@ class TestServeStatic < Testcase # ensure sendfile works on Unix sockets s = UNIXSocket.new(sock) - s.close_on_exec = true s.write "GET /COPYING\r\n\r\n" assert_equal gplv3, Timeout.timeout(30) { s.read } s.close diff --git a/test/test_server.rb b/test/test_server.rb index a113b43..75e1857 100644 --- a/test/test_server.rb +++ b/test/test_server.rb @@ -182,7 +182,6 @@ class TestServer < Testcase tmpdir = yahns_mktmpdir sock = "#{tmpdir}/sock" unix_srv = UNIXServer.new(sock) - unix_srv.close_on_exec = true msgs = %w(ZZ zz) err = @err cfg = Yahns::Config.new @@ -234,7 +233,6 @@ class TestServer < Testcase bpipe[0].close a = UNIXSocket.new(sock) b = UNIXSocket.new(sock) - b.close_on_exec = a.close_on_exec = true a.write("GET /sleep HTTP/1.0\r\n\r\n") r = IO.select([a], nil, nil, 4) assert r, "nothing ready" @@ -681,7 +679,6 @@ class TestServer < Testcase assert_equal "INFO HIHI\n", re.read c = UNIXSocket.new(sock) - c.close_on_exec = true c.write "GET /\r\n\r\n" assert_equal c, c.wait(30) assert_equal "OK", c.read diff --git a/test/test_unix_socket.rb b/test/test_unix_socket.rb index 7b821e3..b4e338c 100644 --- a/test/test_unix_socket.rb +++ b/test/test_unix_socket.rb @@ -12,9 +12,7 @@ class TestUnixSocket < Testcase def unix_socket(path) Timeout.timeout(30) do begin - c = UNIXSocket.new(path) - c.close_on_exec = true - return c + return UNIXSocket.new(path) rescue Errno::ENOENT sleep 0.01 retry diff --git a/test/test_wbuf.rb b/test/test_wbuf.rb index 89825db..0135958 100644 --- a/test/test_wbuf.rb +++ b/test/test_wbuf.rb @@ -19,7 +19,7 @@ class TestWbuf < Testcase end def socketpair - KgioUS.pair.each { |io| io.close_on_exec = true } + KgioUS.pair end def test_wbuf |