From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id A4213207EB for ; Thu, 27 Apr 2017 00:54:51 +0000 (UTC) From: Eric Wong To: yahns-public@yhbt.net Subject: [PATCH] test: allow setting TAIL env to watch error logs Date: Thu, 27 Apr 2017 00:54:51 +0000 Message-Id: <20170427005451.19296-1-e@80x24.org> List-Id: Setting TAIL=1 will automatically use the portable "tail -f". This can be helpful in diagnosing failures during development. GNU tail users may set TAIL="tail -F" (or "gtail -F") to use the "-F" ("--follow=name") option to track changes across SIGUSR1 log reopening testing. --- test/server_helper.rb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/test/server_helper.rb b/test/server_helper.rb index cb11e79..9ef15c6 100644 --- a/test/server_helper.rb +++ b/test/server_helper.rb @@ -65,12 +65,29 @@ def server_helper_teardown @srv.close if defined?(@srv) && !@srv.closed? @ru.close! if defined?(@ru) && @ru check_err if defined?(@err) + Timeout.timeout(30) do + Process.kill(:TERM, @tail_pid) + Process.waitpid(@tail_pid) + end if @tail_pid end def server_helper_setup @srv = TCPServer.new(ENV["TEST_HOST"] || "127.0.0.1", 0) @err = tmpfile(%w(srv .err)) @ru = nil + @tail_pid = nil + case tail = ENV['TAIL'] + when '1' + tail = 'tail -f' # POSIX + when nil, '0' + tail = nil + # else : allow users to specify 'tail -F' or 'gtail -F' for GNU + end + if tail + cmd = tail.split(/\s+/) + cmd << @err.path + @tail_pid = spawn(*cmd) + end end def mkserver(cfg, srv = @srv) -- EW