unofficial mirror of meta@public-inbox.org
 help / color / mirror / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] test_common: don't attempt to seek on pipes and terminals
Date: Sat, 24 Apr 2021 20:09:36 +0000	[thread overview]
Message-ID: <20210424200936.27326-1-e@80x24.org> (raw)

This allows proper error reporting on daemon failure
when using "check-run".
---
 lib/PublicInbox/TestCommon.pm | 1 +
 t/run.perl                    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index 49cecacd..09256852 100644
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -321,6 +321,7 @@ sub run_script ($;$$) {
 	# slurp the redirects back into user-supplied strings
 	for my $fd (1..2) {
 		my $fh = $fhref->[$fd] or next;
+		next unless -f $fh;
 		seek($fh, 0, SEEK_SET) or die "seek: $!";
 		my $redir = $opt->{$fd};
 		local $/;
diff --git a/t/run.perl b/t/run.perl
index 1fb1c5f0..f4e235b7 100755
--- a/t/run.perl
+++ b/t/run.perl
@@ -225,6 +225,6 @@ for (my $i = $repeat; $i != 0; $i--) {
 
 print $OLDOUT "1..".($repeat * scalar(@tests))."\n" if $repeat >= 0;
 if ($lei_env && $$ == $owner_pid) {
-	my $opt = {}; # 1 => $OLDOUT, 2 => $OLDERR };
+	my $opt = { 1 => $OLDOUT, 2 => $OLDERR };
 	run_script([qw(lei daemon-kill)], $lei_env, $opt);
 }

                 reply	other threads:[~2021-04-24 20:09 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210424200936.27326-1-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).