yahns Ruby server user/dev discussion
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: yahns-public@yhbt.net
Cc: Eric Wong <e@80x24.org>
Subject: [PATCH] test/test_rack_hijack: ensure proper ordering of log messages
Date: Fri, 17 Jul 2015 06:43:52 +0000	[thread overview]
Message-ID: <1437115432-11869-1-git-send-email-e@80x24.org> (raw)

Getting the logs to show up in order is tricky in a multithreaded
 test/test_rack_hijack.rb | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/test/test_rack_hijack.rb b/test/test_rack_hijack.rb
index 2a9f23e..101f085 100644
--- a/test/test_rack_hijack.rb
+++ b/test/test_rack_hijack.rb
@@ -52,19 +52,27 @@ class TestRackHijack < Testcase
     pid = mkserver(cfg)
     res = Net::HTTP.start(host, port) { |h| h.get("/hijack_req") }
+    wait_for_msg = lambda do |n|
+      tries = 10000
+      begin
+        Thread.new { Thread.pass }.join # calls sched_yield() on MRI
+      end until File.readlines(err.path).grep(/DieIfUsed/).size >= n ||
+                (tries -= 1) < 0
+    end
     assert_equal "request.hijacked", res.body
     assert_equal 200, res.code.to_i
     assert_equal "1.0", res.http_version
+    wait_for_msg.call(1)
     res = Net::HTTP.start(host, port) { |h| h.get("/hijack_res") }
     assert_equal "response.hijacked", res.body
     assert_equal 200, res.code.to_i
     assert_equal "zzz", res["X-Test"]
     assert_equal "1.1", res.http_version
-    # hope this calls sched_yield() so the forked process runs and writes
-    # to the log.
-    Thread.new { Thread.pass }.join
+    wait_for_msg.call(2)
     errs = File.readlines(err.path).grep(/DieIfUsed/)
     assert_equal([ "INFO #{pid} closed DieIfUsed 1\n",

                 reply	other threads:[~2015-07-17  6:43 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:

  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=1437115432-11869-1-git-send-email-e@80x24.org \
    --to=e@80x24.org \
    --cc=yahns-public@yhbt.net \


* 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


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).