testcommon: DESTROY: wait for killed daemon

Otherwise, the waitpid(-1, 0) call in Xapcmd::process_queue()
may reap it in a subsequent test when using t/run.perl to reuse
processes for testing.

While we're at it, make Xapcmd::process_queue warn about unknown
PIDs in case other PIDs leak through to us in the future.

2 files changed, 8 insertions, 4 deletions

diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index 6e3e9d8c..e9efbac7 100644
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -319,8 +319,9 @@ sub kill {
 }
 
 sub join {
-        my ($self) = @_;
+        my ($self, $sig) = @_;
         my $pid = delete $self->{pid} or return;
+        CORE::kill($sig, $pid) if defined $sig;
         my $ret = waitpid($pid, 0);
         defined($ret) or die "waitpid($pid): $!";
         $ret == $pid or die "waitpid($pid) != $ret";
@@ -333,8 +334,7 @@ sub DESTROY {
                 PublicInbox::TestCommon::wait_for_tail();
                 CORE::kill('TERM', $tail);
         }
-        my $pid = delete $self->{pid} or return;
-        CORE::kill('TERM', $pid);
+        $self->join('TERM');
 }
 
 1;
diff --git a/lib/PublicInbox/Xapcmd.pm b/lib/PublicInbox/Xapcmd.pm
index 8e2b9063..337978bd 100644
--- a/lib/PublicInbox/Xapcmd.pm
+++ b/lib/PublicInbox/Xapcmd.pm
@@ -142,7 +142,11 @@ sub process_queue {
                 while (scalar keys %pids) {
                         my $pid = waitpid(-1, 0);
                         my $args = delete $pids{$pid};
-                        die join(' ', @$args)." failed: $?\n" if $?;
+                        if ($args) {
+                                die join(' ', @$args)." failed: $?\n" if $?;
+                        } else {
+                                warn "unknown PID($pid) reaped: $?\n";
+                        }
                 }
         }
 }