[PATCH] test_server: fix race condition in hooks test

[PATCH] test_server: fix race condition in hooks test

[Eric Wong]

We need to ensure the master process is done writing to logs
when we check them.  Do that by sending a SIGQUIT to the master
to shut it down, as the master process will defer the SIGQUIT
until after the test log is written to the kernel.
---
 test/test_server.rb | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/test/test_server.rb b/test/test_server.rb
index 2ed43a1..c753919 100644
--- a/test/test_server.rb
+++ b/test/test_server.rb
@@ -433,7 +433,7 @@ class TestServer < Testcase
       stderr_path err.path
       stdout_path out.path
     end
-    pid = mkserver(cfg)
+    master_pid = pid = mkserver(cfg)
     c = get_tcp_client(host, port)
     c.write("GET / HTTP/1.0\r\nHost: example.com\r\n\r\n")
     buf = Timeout.timeout(10) { c.read }
@@ -442,19 +442,24 @@ class TestServer < Testcase
     assert_match(/200 OK/, head)
     assert_match(/\A\d+\z/, body)
     worker_pid = body.to_i
+
+    # ensure atfork_parent has run
+    quit_wait(master_pid)
+    master_pid = nil
+
     lines = out.readlines.map!(&:chomp!)
     out.close!
 
     assert_match %r{INFO hihi from app\.atfork_child}, File.read(err.path)
 
-    assert_equal 3, lines.size
+    assert_equal 3, lines.size, lines.join("\n")
     assert_equal("af #{pid} parent about to spawn", lines.shift)
 
     # child/parent ordering is not guaranteed
     assert_equal 1, lines.grep(/\Aaf #{pid} this is probably not useful\z/).size
     assert_equal 1, lines.grep(/\Aaf #{worker_pid} worker is running\z/).size
   ensure
-    quit_wait(pid)
+    quit_wait(master_pid)
   end
 
   def test_mp_hooks_worker_nr
-- 
EW