daemon: provide TCP_DEFER_ACCEPT for Perl <5.14

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

diff --git a/t/httpd.t b/t/httpd.t
index e7527ed64f2ae6815ccc87e2aec8bae5fb219621..2972afb26a33cba68569a37fbd8415703c49b36c 100644 (file)
--- a/t/httpd.t
+++ b/t/httpd.t
@@ -3,17 +3,12 @@
 use strict;
 use warnings;
 use Test::More;
-
-foreach my $mod (qw(Plack::Util Plack::Builder HTTP::Date HTTP::Status)) {
-       eval "require $mod";
-       plan skip_all => "$mod missing for httpd.t" if $@;
-}
-use File::Temp qw/tempdir/;
+use PublicInbox::TestCommon;
 use Socket qw(IPPROTO_TCP SOL_SOCKET);
-require './t/common.perl';
+require_mods(qw(Plack::Util Plack::Builder HTTP::Date HTTP::Status));
 
 # FIXME: too much setup
-my $tmpdir = tempdir('pi-httpd-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($tmpdir, $for_destroy) = tmpdir();
 my $home = "$tmpdir/pi-home";
 my $err = "$tmpdir/stderr.log";
 my $out = "$tmpdir/stdout.log";
@@ -21,13 +16,11 @@ my $maindir = "$tmpdir/main.git";
 my $group = 'test-httpd';
 my $addr = $group . '@example.com';
 my $cfgpfx = "publicinbox.$group";
-my $httpd = 'blib/script/public-inbox-httpd';
 my $sock = tcp_server();
-my $pid;
+my $td;
 use_ok 'PublicInbox::Git';
 use_ok 'PublicInbox::Import';
 use_ok 'Email::MIME';
-END { kill 'TERM', $pid if defined $pid };
 {
        local $ENV{HOME} = $home;
        my $cmd = [ '-init', $group, $maindir, 'http://example.com/', $addr ];
@@ -52,8 +45,8 @@ EOF
                $im->done($mime);
        }
        ok($sock, 'sock created');
-       $cmd = [ $httpd, '-W0', "--stdout=$out", "--stderr=$err" ];
-       $pid = spawn_listener(undef, $cmd, [$sock]);
+       $cmd = [ '-httpd', '-W0', "--stdout=$out", "--stderr=$err" ];
+       $td = start_script($cmd, undef, { 3 => $sock });
        my $host = $sock->sockhost;
        my $port = $sock->sockport;
        my $conn = tcp_connect($sock);
@@ -78,9 +71,8 @@ EOF
                        "http://$host:$port/$group", "$tmpdir/dumb.git"),
                0, 'clone successful');
 
-       ok(kill('TERM', $pid), 'killed httpd');
-       $pid = undef;
-       waitpid(-1, 0);
+       ok($td->kill, 'killed httpd');
+       $td->join;
 
        is(system('git', "--git-dir=$tmpdir/clone.git",
                  qw(fsck --no-verbose)), 0,
@@ -89,7 +81,7 @@ EOF
 
 SKIP: {
        skip 'TCP_DEFER_ACCEPT is Linux-only', 1 if $^O ne 'linux';
-       my $var = Socket::TCP_DEFER_ACCEPT();
+       my $var = eval { Socket::TCP_DEFER_ACCEPT() } // 9;
        defined(my $x = getsockopt($sock, IPPROTO_TCP, $var)) or die;
        ok(unpack('i', $x) > 0, 'TCP_DEFER_ACCEPT set');
 };