From: Eric Wong <e@80x24.org>
Date: Wed, 17 Mar 2021 07:02:18 +0000 (-0800)
Subject: tests: show lsof output on deleted-file-check failures
X-Git-Tag: v1.7.0~960
X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=commitdiff_plain;h=4c6c853494b4936825741bb5e8885f1312639058

tests: show lsof output on deleted-file-check failures

This may help track down some occasional test failures I'm
seeing.
---

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) };
 	{