From 1fd6784e59e9b6d733b1712573d4689affed0140 Mon Sep 17 00:00:00 2001 From: EW Date: Sun, 11 May 2014 22:08:25 +0000 Subject: test_server: avoid multiple workers for dead parent check This test is less reliable when there are multiple workers as the second worker may not be ready to detect a dead parent. This is still a possible race if the master dies very quicklly before a worker is fully setup. --- test/test_server.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/test_server.rb b/test/test_server.rb index bd38ce3..69babb3 100644 --- a/test/test_server.rb +++ b/test/test_server.rb @@ -302,7 +302,7 @@ class TestServer < Testcase end def test_mp_dead_parent - pid, host, port = new_mp_server + pid, host, port = new_mp_server(1) wpid = nil run_client(host, port) do |res| wpid ||= res.body.to_i @@ -334,7 +334,7 @@ class TestServer < Testcase c.close end - def new_mp_server(nr = 1) + def new_mp_server(nr = 2) ru = @ru = tmpfile(%w(config .ru)) @ru.puts('a = $$.to_s') @ru.puts('run lambda { |_| [ 200, {"Content-Length"=>a.size.to_s},[a]]}') @@ -342,7 +342,7 @@ class TestServer < Testcase cfg = Yahns::Config.new host, port = @srv.addr[3], @srv.addr[1] cfg.instance_eval do - worker_processes 2 + worker_processes nr GTL.synchronize { app(:rack, ru.path) { listen "#{host}:#{port}" } } logger(Logger.new(File.open(err.path, "a"))) end -- cgit v1.2.3-24-ge0c7