From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-2.9 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=unavailable version=3.3.2 X-Original-To: yahns-public@yhbt.net Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 2CE0D20432; Fri, 17 Jul 2015 06:43:55 +0000 (UTC) From: Eric Wong To: yahns-public@yhbt.net Cc: Eric Wong Subject: [PATCH] test/test_rack_hijack: ensure proper ordering of log messages Date: Fri, 17 Jul 2015 06:43:52 +0000 Message-Id: <1437115432-11869-1-git-send-email-e@80x24.org> List-Id: Getting the logs to show up in order is tricky in a multithreaded server... --- 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 end 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", -- EW