about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEW <e+fbsd@80x24.org>2014-05-11 22:08:25 +0000
committerEric Wong <e+fbsd@80x24.org>2014-07-16 19:17:19 +0000
commit1fd6784e59e9b6d733b1712573d4689affed0140 (patch)
treeb05f7139329ad7268332126df7b700aeca6f713d
parenta446759eb7d93fb29488da78fc14922c5b55f7a7 (diff)
downloadyahns-1fd6784e59e9b6d733b1712573d4689affed0140.tar.gz
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.
-rw-r--r--test/test_server.rb6
1 files 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