From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 1/6] qspawn: remove return value from ->finish
Date: Tue, 17 Sep 2019 08:31:18 +0000 [thread overview]
Message-ID: <20190917083123.6468-2-e@80x24.org> (raw)
In-Reply-To: <20190917083123.6468-1-e@80x24.org>
We don't use the return value in real code since we do waitpid
asynchronously, now. So simplify our runtime code at the cost
of making our test slighly more complex.
---
lib/PublicInbox/Qspawn.pm | 1 -
t/qspawn.t | 17 +++++++++++------
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/lib/PublicInbox/Qspawn.pm b/lib/PublicInbox/Qspawn.pm
index 54976b0..6b350f0 100644
--- a/lib/PublicInbox/Qspawn.pm
+++ b/lib/PublicInbox/Qspawn.pm
@@ -141,7 +141,6 @@ sub finish ($;$) {
_do_spawn(@$next);
}
}
- $self->{err}; # may be meaningless if non-blocking
}
sub start {
diff --git a/t/qspawn.t b/t/qspawn.t
index ab6e375..58c6feb 100644
--- a/t/qspawn.t
+++ b/t/qspawn.t
@@ -11,6 +11,12 @@ use_ok 'PublicInbox::Qspawn';
is($res, "err\nout\n", 'captured stderr and stdout');
}
+sub finish_err ($) {
+ my ($qsp) = @_;
+ $qsp->finish;
+ $qsp->{err};
+}
+
my $limiter = PublicInbox::Qspawn::Limiter->new(1);
{
my $x = PublicInbox::Qspawn->new([qw(true)]);
@@ -18,7 +24,7 @@ my $limiter = PublicInbox::Qspawn::Limiter->new(1);
$x->start($limiter, sub {
my ($rpipe) = @_;
is(0, sysread($rpipe, my $buf, 1), 'read zero bytes');
- ok(!$x->finish, 'no error on finish');
+ ok(!finish_err($x), 'no error on finish');
$run = 1;
});
is($run, 1, 'callback ran alright');
@@ -30,8 +36,7 @@ my $limiter = PublicInbox::Qspawn::Limiter->new(1);
$x->start($limiter, sub {
my ($rpipe) = @_;
is(0, sysread($rpipe, my $buf, 1), 'read zero bytes from false');
- my $err = $x->finish;
- ok($err, 'error on finish');
+ ok(finish_err($x), 'error on finish');
$run = 1;
});
is($run, 1, 'callback ran alright');
@@ -57,11 +62,11 @@ foreach my $cmd ([qw(sleep 1)], [qw(sh -c), 'sleep 1; false']) {
} (0..2);
if ($cmd->[-1] =~ /false\z/) {
- ok($s->finish, 'got error on false after sleep');
+ ok(finish_err($s), 'got error on false after sleep');
} else {
- ok(!$s->finish, 'no error on sleep');
+ ok(!finish_err($s), 'no error on sleep');
}
- ok(!$_->[0]->finish, "true $_->[1] succeeded") foreach @t;
+ ok(!finish_err($_->[0]), "true $_->[1] succeeded") foreach @t;
is_deeply([qw(sleep 0 1 2)], \@run, 'ran in order');
}
--
EW
next prev parent reply other threads:[~2019-09-17 8:31 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-17 8:31 [PATCH 0/6] qspawn-related cleanups, comments, and minor fix Eric Wong
2019-09-17 8:31 ` Eric Wong [this message]
2019-09-17 8:31 ` [PATCH 2/6] qspawn: log errors for generic PSGI server users Eric Wong
2019-09-17 8:31 ` [PATCH 3/6] qspawn: shorten lifetime of circular references Eric Wong
2019-09-17 8:31 ` [PATCH 4/6] qspawn: improve variable naming and commenting Eric Wong
2019-09-17 8:31 ` [PATCH 5/6] http: drop unused `$env' variable after delete Eric Wong
2019-09-17 8:31 ` [PATCH 6/6] http: remove unnecessary delete Eric Wong
2019-09-17 9:19 ` [MAYBE] kill rpipe early Eric Wong
2019-09-17 9:40 ` Eric Wong
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: http://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=20190917083123.6468-2-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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
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).