From 92988d4a8e8b2365c61b9ec1b50f97b4ea1cd56a Mon Sep 17 00:00:00 2001 From: "Yamashita, Yuu" Date: Wed, 4 Nov 2026 14:55:51 +0900 Subject: [PATCH] test: stabilize WEBrick fixture lifecycle --- test/helper.rb | 18 +++++--- test/test_helper_lifecycle.rb | 84 +++++++++++++++++++++++++++++++++++ test/test_http-access2.rb | 1 + test/test_httpclient.rb | 2 - 4 files changed, 98 insertions(+), 7 deletions(-) create mode 100644 test/test_helper_lifecycle.rb diff --git a/test/helper.rb b/test/helper.rb index 7a3c3ba3..b146826e 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -67,10 +67,12 @@ module Helper ProxyPort = 17172 def serverport + setup_server unless @server @serverport end def proxyport + setup_proxyserver unless @proxyserver @proxyport end @@ -95,9 +97,15 @@ def setup end def teardown - teardown_client if @client - teardown_proxyserver if @proxyserver - teardown_server if @server + begin + teardown_client if @client + ensure + begin + teardown_proxyserver if @proxyserver + ensure + teardown_server if @server + end + end end def setup_client @@ -134,12 +142,12 @@ def teardown_client def teardown_server @server.shutdown - #@server_thread.kill + @server_thread.join if @server_thread end def teardown_proxyserver @proxyserver.shutdown - #@proxyserver_thread.kill + @proxyserver_thread.join if @proxyserver_thread end def start_server_thread(server) diff --git a/test/test_helper_lifecycle.rb b/test/test_helper_lifecycle.rb new file mode 100644 index 00000000..23113086 --- /dev/null +++ b/test/test_helper_lifecycle.rb @@ -0,0 +1,84 @@ +require File.expand_path('helper', File.dirname(__FILE__)) + +class TestSupportLifecycle < Test::Unit::TestCase + Server = Struct.new(:events, :kind) do + def shutdown + events << [kind, :shutdown] + end + end + + Listener = Struct.new(:events, :kind) do + def join + events << [kind, :join] + end + end + + def setup + @events = [] + @fixture = Object.new.extend(Helper) + @fixture.setup + end + + def test_serverport_lazily_starts_server_once + install_lazy_server(:server, 18_081) + + assert_equal(18_081, @fixture.serverport) + assert_equal(18_081, @fixture.serverport) + assert_equal([[:server, :start]], @events) + end + + def test_proxyport_lazily_starts_proxy_once + install_lazy_server(:proxyserver, 18_082) + + assert_equal(18_082, @fixture.proxyport) + assert_equal(18_082, @fixture.proxyport) + assert_equal([[:proxyserver, :start]], @events) + end + + def test_teardown_server_joins_listener + install_server(:server) + + @fixture.teardown_server + + assert_equal([[:server, :shutdown], [:server, :join]], @events) + end + + def test_teardown_proxyserver_joins_listener + install_server(:proxyserver) + + @fixture.teardown_proxyserver + + assert_equal([[:proxyserver, :shutdown], [:proxyserver, :join]], @events) + end + + def test_client_cleanup_error_still_stops_both_servers + install_server(:server) + install_server(:proxyserver) + client = Object.new + def client.reset_all + raise IOError, 'client cleanup failed' + end + @fixture.instance_variable_set(:@client, client) + + assert_raise(IOError) { @fixture.teardown } + assert_equal([[:proxyserver, :shutdown], [:proxyserver, :join], + [:server, :shutdown], [:server, :join]], @events) + end + + private + + def install_server(kind) + @fixture.instance_variable_set("@#{kind}", Server.new(@events, kind)) + @fixture.instance_variable_set("@#{kind}_thread", Listener.new(@events, kind)) + end + + def install_lazy_server(kind, port) + events = @events + @fixture.define_singleton_method("setup_#{kind}") do + events << [kind, :start] + instance_variable_set("@#{kind}", Server.new(events, kind)) + port_variable = kind == :server ? :@serverport : :@proxyport + instance_variable_set(port_variable, port) + end + end +end diff --git a/test/test_http-access2.rb b/test/test_http-access2.rb index b7ac6d18..1fa7f47b 100644 --- a/test/test_http-access2.rb +++ b/test/test_http-access2.rb @@ -143,6 +143,7 @@ def test_proxy end def test_noproxy_for_localhost + setup_proxyserver @proxyio.truncate(0) @client.proxy = proxyurl assert_equal(200, @client.head(serverurl).status) diff --git a/test/test_httpclient.rb b/test/test_httpclient.rb index d1d664ca..61da5917 100644 --- a/test/test_httpclient.rb +++ b/test/test_httpclient.rb @@ -9,7 +9,6 @@ class TestHTTPClient < Test::Unit::TestCase def setup super - setup_server setup_client end @@ -279,7 +278,6 @@ def test_proxy_env_cgi end def test_empty_proxy_env - setup_proxyserver escape_env do ENV['http_proxy'] = "" client = HTTPClient.new