From: Eric Wong <e@80x24.org>
To: unicorn-public@bogomips.org
Subject: [PATCH] tests: keep disabled tests defined
Date: Fri, 10 Mar 2017 21:26:14 +0000 [thread overview]
Message-ID: <20170310212614.20670-1-e@80x24.org> (raw)
Some versions of test-unit will fail if an unspecified test is
attempted via "-n", so we need to define an empty test.
We cannot use "skip", either, as that seems exclusive to
minitest; and we won't use minitest since it has more
incompatible changes than test-unit over the last 8 years.
---
test/exec/test_exec.rb | 7 ++++---
test/unit/test_http_parser.rb | 18 ------------------
test/unit/test_socket_helper.rb | 12 ++++++++----
test/unit/test_util.rb | 4 ++--
4 files changed, 14 insertions(+), 27 deletions(-)
diff --git a/test/exec/test_exec.rb b/test/exec/test_exec.rb
index ca0b7bc..4941c4e 100644
--- a/test/exec/test_exec.rb
+++ b/test/exec/test_exec.rb
@@ -97,6 +97,9 @@ def teardown
end
def test_sd_listen_fds_emulation
+ # [ruby-core:69895] [Bug #11336] fixed by r51576
+ return if RUBY_VERSION.to_f < 2.3
+
File.open("config.ru", "wb") { |fp| fp.write(HI) }
sock = TCPServer.new(@addr, @port)
@@ -124,9 +127,7 @@ def test_sd_listen_fds_emulation
end
ensure
sock.close if sock
- # disabled test on old Rubies: https://bugs.ruby-lang.org/issues/11336
- # [ruby-core:69895] [Bug #11336] fixed by r51576
- end if RUBY_VERSION.to_f >= 2.3
+ end
def test_inherit_listener_unspecified
File.open("config.ru", "wb") { |fp| fp.write(HI) }
diff --git a/test/unit/test_http_parser.rb b/test/unit/test_http_parser.rb
index 7cbc0f8..31e6f71 100644
--- a/test/unit/test_http_parser.rb
+++ b/test/unit/test_http_parser.rb
@@ -851,24 +851,6 @@ def test_empty_header
assert_equal '', parser.env['HTTP_HOST']
end
- # so we don't care about the portability of this test
- # if it doesn't leak on Linux, it won't leak anywhere else
- # unless your C compiler or platform is otherwise broken
- LINUX_PROC_PID_STATUS = "/proc/self/status"
- def test_memory_leak
- match_rss = /^VmRSS:\s+(\d+)/
- if File.read(LINUX_PROC_PID_STATUS) =~ match_rss
- before = $1.to_i
- 1000000.times { Unicorn::HttpParser.new }
- File.read(LINUX_PROC_PID_STATUS) =~ match_rss
- after = $1.to_i
- diff = after - before
- assert(diff < 10000, "memory grew more than 10M: #{diff}")
- end
- end if RUBY_PLATFORM =~ /linux/ &&
- File.readable?(LINUX_PROC_PID_STATUS) &&
- !defined?(RUBY_ENGINE)
-
def test_memsize
require 'objspace'
if ObjectSpace.respond_to?(:memsize_of)
diff --git a/test/unit/test_socket_helper.rb b/test/unit/test_socket_helper.rb
index 7526e82..8699409 100644
--- a/test/unit/test_socket_helper.rb
+++ b/test/unit/test_socket_helper.rb
@@ -150,28 +150,31 @@ def test_sock_name
end
def test_tcp_defer_accept_default
+ return unless defined?(TCP_DEFER_ACCEPT)
port = unused_port @test_addr
name = "#@test_addr:#{port}"
sock = bind_listen(name)
cur = sock.getsockopt(Socket::SOL_TCP, TCP_DEFER_ACCEPT).unpack('i')[0]
assert cur >= 1
- end if defined?(TCP_DEFER_ACCEPT)
+ end
def test_tcp_defer_accept_disable
+ return unless defined?(TCP_DEFER_ACCEPT)
port = unused_port @test_addr
name = "#@test_addr:#{port}"
sock = bind_listen(name, :tcp_defer_accept => false)
cur = sock.getsockopt(Socket::SOL_TCP, TCP_DEFER_ACCEPT).unpack('i')[0]
assert_equal 0, cur
- end if defined?(TCP_DEFER_ACCEPT)
+ end
def test_tcp_defer_accept_nr
+ return unless defined?(TCP_DEFER_ACCEPT)
port = unused_port @test_addr
name = "#@test_addr:#{port}"
sock = bind_listen(name, :tcp_defer_accept => 60)
cur = sock.getsockopt(Socket::SOL_TCP, TCP_DEFER_ACCEPT).unpack('i')[0]
assert cur > 1
- end if defined?(TCP_DEFER_ACCEPT)
+ end
def test_ipv6only
port = begin
@@ -186,6 +189,7 @@ def test_ipv6only
end
def test_reuseport
+ return unless defined?(Socket::SO_REUSEPORT)
port = unused_port @test_addr
name = "#@test_addr:#{port}"
sock = bind_listen(name, :reuseport => true)
@@ -193,5 +197,5 @@ def test_reuseport
assert_operator cur, :>, 0
rescue Errno::ENOPROTOOPT
# kernel does not support SO_REUSEPORT (older Linux)
- end if defined?(Socket::SO_REUSEPORT)
+ end
end
diff --git a/test/unit/test_util.rb b/test/unit/test_util.rb
index 4d17a16..dc6302e 100644
--- a/test/unit/test_util.rb
+++ b/test/unit/test_util.rb
@@ -69,7 +69,7 @@ def test_reopen_logs_renamed_with_encoding
}
}
tmp.close!
- end if STDIN.respond_to?(:external_encoding)
+ end
def test_reopen_logs_renamed_with_internal_encoding
tmp = Tempfile.new('')
@@ -101,5 +101,5 @@ def test_reopen_logs_renamed_with_internal_encoding
}
}
tmp.close!
- end if STDIN.respond_to?(:external_encoding)
+ end
end
--
EW
reply other threads:[~2017-03-10 21:26 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://yhbt.net/unicorn/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170310212614.20670-1-e@80x24.org \
--to=e@80x24.org \
--cc=unicorn-public@bogomips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
http://yhbt.net/unicorn.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).