t/common: start_script replaces spawn_listener

[public-inbox.git] / t / httpd-unix.t

diff --git a/t/httpd-unix.t b/t/httpd-unix.t
index b3cf8693118b66cf67f350d7366fd4c3566333de..5ec70fd8f1836f74e7ccd7c239115e6db81eb74a 100644 (file)
--- a/t/httpd-unix.t
+++ b/t/httpd-unix.t
@@ -1,38 +1,31 @@
-# Copyright (C) 2016-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 # Tests for binding Unix domain sockets
 use strict;
 use warnings;
 use Test::More;
+require './t/common.perl';
+use Errno qw(EADDRINUSE);
 
-foreach my $mod (qw(Plack::Util Plack::Builder Danga::Socket
-                       HTTP::Date HTTP::Status)) {
+foreach my $mod (qw(Plack::Util Plack::Builder HTTP::Date HTTP::Status)) {
        eval "require $mod";
        plan skip_all => "$mod missing for httpd-unix.t" if $@;
 }
 
 use File::Temp qw/tempdir/;
 use IO::Socket::UNIX;
-use Cwd qw/getcwd/;
-use Fcntl qw(FD_CLOEXEC F_SETFD F_GETFD :seek);
 my $tmpdir = tempdir('httpd-unix-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 my $unix = "$tmpdir/unix.sock";
-my $httpd = 'blib/script/public-inbox-httpd';
-my $psgi = getcwd() . '/t/httpd-corner.psgi';
+my $psgi = './t/httpd-corner.psgi';
 my $out = "$tmpdir/out.log";
 my $err = "$tmpdir/err.log";
-
-my $pid;
-END { kill 'TERM', $pid if defined $pid };
+my $td;
 
 my $spawn_httpd = sub {
        my (@args) = @_;
-       $pid = fork;
-       if ($pid == 0) {
-               exec $httpd, @args, "--stdout=$out", "--stderr=$err", $psgi;
-               die "FAIL: $!\n";
-       }
-       ok(defined $pid, 'forked httpd process successfully');
+       push @args, '-W0';
+       my $cmd = [ '-httpd', @args, "--stdout=$out", "--stderr=$err", $psgi ];
+       $td = start_script($cmd);
 };
 
 {
@@ -45,8 +38,9 @@ my $spawn_httpd = sub {
 
 ok(!-S $unix, 'UNIX socket does not exist, yet');
 $spawn_httpd->("-l$unix");
+my %o = (Peer => $unix, Type => SOCK_STREAM);
 for (1..1000) {
-       last if -S $unix;
+       last if -S $unix && IO::Socket::UNIX->new(%o);
        select undef, undef, undef, 0.02
 }
 
@@ -66,15 +60,18 @@ sub check_sock ($) {
 check_sock($unix);
 
 { # do not clobber existing socket
-       my $fpid = fork;
-       if ($fpid == 0) {
-               open STDOUT, '>>', "$tmpdir/1" or die "redirect failed: $!";
-               open STDERR, '>>', "$tmpdir/2" or die "redirect failed: $!";
-               exec $httpd, '-l', $unix, '-W0', $psgi;
-               die "FAIL: $!\n";
-       }
-       is($fpid, waitpid($fpid, 0), 'second httpd exits');
-       isnt($?, 0, 'httpd failed with failure to bind');
+       my %err = ( 'linux' => EADDRINUSE );
+       open my $out, '>>', "$tmpdir/1" or die "redirect failed: $!";
+       open my $err, '>>', "$tmpdir/2" or die "redirect failed: $!";
+       my $cmd = ['-httpd', '-l', $unix, '-W0', $psgi];
+       my $ftd = start_script($cmd, undef, { 1 => $out, 2 => $err });
+       $ftd->join;
+       isnt($?, 0, 'httpd failure set $?');
+       SKIP: {
+               my $ec = $err{$^O} or
+                       skip("not sure if $^O fails with EADDRINUSE", 1);
+               is($? >> 8, $ec, 'httpd failed with EADDRINUSE');
+       };
        open my $fh, "$tmpdir/2" or die "failed to open $tmpdir/2: $!";
        local $/;
        my $e = <$fh>;
@@ -83,10 +80,8 @@ check_sock($unix);
 }
 
 {
-       my $kpid = $pid;
-       $pid = undef;
-       is(kill('TERM', $kpid), 1, 'terminate existing process');
-       is(waitpid($kpid, 0), $kpid, 'existing httpd terminated');
+       is($td->kill, 1, 'terminate existing process');
+       $td->join;
        is($?, 0, 'existing httpd exited successfully');
        ok(-S $unix, 'unix socket still exists');
 }
@@ -97,9 +92,8 @@ SKIP: {
 
        # wait for daemonization
        $spawn_httpd->("-l$unix", '-D', '-P', "$tmpdir/pid");
-       my $kpid = $pid;
-       $pid = undef;
-       is(waitpid($kpid, 0), $kpid, 'existing httpd terminated');
+       $td->join;
+       is($?, 0, 'daemonized process OK');
        check_sock($unix);
 
        ok(-f "$tmpdir/pid", 'pid file written');