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,AWL,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 950FF1F5AF for ; Mon, 9 Mar 2015 10:04:22 +0000 (UTC) From: Eric Wong To: yahns-public@yhbt.net Subject: [PATCH] test/test_server: fix leftover process from inherit test Date: Mon, 9 Mar 2015 10:04:22 +0000 Message-Id: <1425895462-22981-1-git-send-email-e@80x24.org> X-Mailer: git-send-email 2.3.1.170.ge0b4cad List-Id: Oops, this test bug was introduced in: commit e413325737f23c5ec27a02246f95077bc1fb038d ("acceptor: close inherited-but-unneeded sockets") --- test/test_server.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/test_server.rb b/test/test_server.rb index b7cb3e6..0410f65 100644 --- a/test/test_server.rb +++ b/test/test_server.rb @@ -815,7 +815,7 @@ class TestServer < Testcase GTL.synchronize { app(:rack, ru) { listen "#{host}:#{port}" } } logger(Logger.new(err.path)) end - mkserver(cfg, @srv) do + pid = mkserver(cfg, @srv) do s2.autoclose = false ENV["YAHNS_FD"] = "#{@srv.fileno},#{s2.fileno}" end @@ -842,5 +842,7 @@ class TestServer < Testcase assert_nil a2.read(1) a2.close s2.close + ensure + quit_wait(pid) end end -- 2.3.1.170.ge0b4cad