From: Eric Wong <e@80x24.org>
To: yahns-public@yhbt.net
Subject: [PATCH] test_server: fix race condition in hooks test
Date: Sun, 13 Dec 2015 02:03:50 +0000 [thread overview]
Message-ID: <20151213020350.4064-1-e@80x24.org> (raw)
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
reply other threads:[~2015-12-13 2:03 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://yhbt.net/yahns/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151213020350.4064-1-e@80x24.org \
--to=e@80x24.org \
--cc=yahns-public@yhbt.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhbt.net/yahns.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).