From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: 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.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id BD5381FB0E for ; Wed, 17 Mar 2021 07:02:19 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 5/5] tests: show lsof output on deleted-file-check failures Date: Tue, 16 Mar 2021 23:02:18 -0800 Message-Id: <20210317070218.7971-6-e@80x24.org> In-Reply-To: <20210317070218.7971-1-e@80x24.org> References: <20210317070218.7971-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: This may help track down some occasional test failures I'm seeing. --- t/httpd-corner.t | 3 ++- t/nntpd.t | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/t/httpd-corner.t b/t/httpd-corner.t index 794d8aeb..296e1dc1 100644 --- a/t/httpd-corner.t +++ b/t/httpd-corner.t @@ -610,7 +610,8 @@ SKIP: { my $null_in = ''; my $rdr = { 2 => \(my $null_err), 0 => \$null_in }; my @lsof = xqx([$lsof, '-p', $td->{pid}], undef, $rdr); - is_deeply([grep(/\bdeleted\b/, @lsof)], [], 'no lingering deleted inputs'); + my $d = [ grep(/\(deleted\)/, @lsof) ]; + is_deeply($d, [], 'no lingering deleted inputs') or diag explain($d); # filter out pipes inherited from the parent my @this = xqx([$lsof, '-p', $$], undef, $rdr); diff --git a/t/nntpd.t b/t/nntpd.t index 7db371dd..ce4d7cf9 100644 --- a/t/nntpd.t +++ b/t/nntpd.t @@ -365,8 +365,9 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000 $lsof or skip 'lsof missing', 1; ($^O =~ /\A(?:linux)\z/) or skip "lsof /(deleted)/ check untested on $^O", 1; - my @of = xqx([$lsof, '-p', $td->{pid}], undef, $noerr); - is(scalar(grep(/\(deleted\)/, @of)), 0, 'no deleted files'); + my @lsof = xqx([$lsof, '-p', $td->{pid}], undef, $noerr); + my $d = [ grep(/\(deleted\)/, @lsof) ]; + is_deeply($d, [], 'no deleted files') or diag explain($d); }; SKIP: { test_watch($tmpdir, $host_port, $group) }; {