user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
* [PATCH] test_common: don't attempt to seek on pipes and terminals
@ 2021-04-24 20:09 Eric Wong
  0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2021-04-24 20:09 UTC (permalink / raw)
  To: meta

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

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2021-04-24 20:09 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-24 20:09 [PATCH] test_common: don't attempt to seek on pipes and terminals Eric Wong

user/dev discussion of public-inbox itself

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://public-inbox.org/meta
	git clone --mirror http://czquwvybam4bgbro.onion/meta
	git clone --mirror http://hjrcffqmbrq6wope.onion/meta
	git clone --mirror http://ou63pmih66umazou.onion/meta

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 meta meta/ https://public-inbox.org/meta \
		meta@public-inbox.org
	public-inbox-index meta

Example config snippet for mirrors.
Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.mail.public-inbox.meta
	nntp://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/inbox.comp.mail.public-inbox.meta
	nntp://ie5yzdi7fg72h7s4sdcztq5evakq23rdt33mfyfcddc5u3ndnw24ogqd.onion/inbox.comp.mail.public-inbox.meta
	nntp://4uok3hntl7oi7b4uf4rtfwefqeexfzil2w6kgk2jn5z2f764irre7byd.onion/inbox.comp.mail.public-inbox.meta
	nntp://news.gmane.io/gmane.mail.public-inbox.general
 note: .onion URLs require Tor: https://www.torproject.org/

code repositories for project(s) associated with this inbox:

	https://80x24.org/public-inbox.git

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git