diff options
author | Eric Wong <e@80x24.org> | 2015-12-13 02:02:14 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2015-12-13 02:02:14 +0000 |
commit | 5464516486d0ac08406c956b93d3d71e0310837b (patch) | |
tree | bdec2128df5f087a11c27e7e5e9782e2f28761d8 | |
parent | f6fc3ac41d8e43dfb8558be88ca4de9f6c856dd5 (diff) | |
download | yahns-5464516486d0ac08406c956b93d3d71e0310837b.tar.gz |
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.
-rw-r--r-- | test/test_server.rb | 11 |
1 files 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 |