X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fqspawn.t;h=224e20db4b1717cd7078250a1de41a12e4bf6918;hb=b66f13a1764606b9c4d0a6a8e22ab1a8e30570ad;hp=8bc88e0e0469f439c78cb31482955ee64ace56b1;hpb=574cf9098d09c7c2e10c28cf577321161ddecd61;p=public-inbox.git
diff --git a/t/qspawn.t b/t/qspawn.t
index 8bc88e0e..224e20db 100644
--- a/t/qspawn.t
+++ b/t/qspawn.t
@@ -1,6 +1,6 @@
-# Copyright (C) 2016-2019 all contributors
+# Copyright (C) all contributors
# License: AGPL-3.0+
-use strict;
+use v5.12;
use Test::More;
use_ok 'PublicInbox::Qspawn';
@@ -10,17 +10,23 @@ use_ok 'PublicInbox::Qspawn';
my $res;
$qsp->psgi_qx({}, undef, sub { $res = ${$_[0]} });
is($res, "err\nout\n", 'captured stderr and stdout');
+
+ $res = undef;
+ $qsp = PublicInbox::Qspawn->new($cmd, {}, { 2 => \*STDOUT });
+ $qsp->psgi_qx({}, undef, sub { $res = ${$_[0]} });
+ is($res, "err\nout\n", 'captured stderr and stdout');
}
sub finish_err ($) {
my ($qsp) = @_;
$qsp->finish;
- $qsp->{err};
+ $qsp->{qsp_err} && ${$qsp->{qsp_err}};
}
my $limiter = PublicInbox::Qspawn::Limiter->new(1);
{
my $x = PublicInbox::Qspawn->new([qw(true)]);
+ $x->{qsp_err} = \(my $err = '');
my $run = 0;
$x->start($limiter, sub {
my ($self) = @_;
@@ -32,7 +38,9 @@ my $limiter = PublicInbox::Qspawn::Limiter->new(1);
}
{
+ my @err; local $SIG{__WARN__} = sub { push @err, @_ };
my $x = PublicInbox::Qspawn->new([qw(false)]);
+ $x->{qsp_err} = \(my $err = '');
my $run = 0;
$x->start($limiter, sub {
my ($self) = @_;
@@ -42,10 +50,13 @@ my $limiter = PublicInbox::Qspawn::Limiter->new(1);
$run = 1;
});
is($run, 1, 'callback ran alright');
+ ok(scalar @err, 'got warning');
}
foreach my $cmd ([qw(sleep 1)], [qw(sh -c), 'sleep 1; false']) {
+ my @err; local $SIG{__WARN__} = sub { push @err, @_ };
my $s = PublicInbox::Qspawn->new($cmd);
+ $s->{qsp_err} = \(my $err = '');
my @run;
$s->start($limiter, sub {
my ($self) = @_;
@@ -65,8 +76,10 @@ foreach my $cmd ([qw(sleep 1)], [qw(sh -c), 'sleep 1; false']) {
if ($cmd->[-1] =~ /false\z/) {
ok(finish_err($s), 'got error on false after sleep');
+ ok(scalar @err, 'got warning');
} else {
ok(!finish_err($s), 'no error on sleep');
+ is_deeply([], \@err, 'no warnings');
}
ok(!finish_err($_->[0]), "true $_->[1] succeeded") foreach @t;
is_deeply([qw(sleep 0 1 2)], \@run, 'ran in order');