v2writable: move git->cleanup to the correct place

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

diff --git a/t/httpd.t b/t/httpd.t
index c2e73608c90122c5a77246aca238a940929c740a..1340a7b3c02bb2003b0737cae4b0fe7809187155 100644 (file)
--- a/t/httpd.t
+++ b/t/httpd.t
@@ -1,19 +1,16 @@
-# Copyright (C) 2016 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>
 use strict;
 use warnings;
 use Test::More;
 
-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.t" if $@;
 }
 use File::Temp qw/tempdir/;
-use Cwd qw/getcwd/;
-use IO::Socket;
-use Fcntl qw(FD_CLOEXEC F_SETFD F_GETFD);
-use Socket qw(SO_KEEPALIVE IPPROTO_TCP TCP_NODELAY);
+use Socket qw(IPPROTO_TCP SOL_SOCKET);
+require './t/common.perl';
 
 # FIXME: too much setup
 my $tmpdir = tempdir('pi-httpd-XXXXXX', TMPDIR => 1, CLEANUP => 1);
@@ -26,15 +23,7 @@ my $addr = $group . '@example.com';
 my $cfgpfx = "publicinbox.$group";
 my $httpd = 'blib/script/public-inbox-httpd';
 my $init = 'blib/script/public-inbox-init';
-
-my %opts = (
-       LocalAddr => '127.0.0.1',
-       ReuseAddr => 1,
-       Proto => 'tcp',
-       Type => SOCK_STREAM,
-       Listen => 1024,
-);
-my $sock = IO::Socket::INET->new(%opts);
+my $sock = tcp_server();
 my $pid;
 use_ok 'PublicInbox::Git';
 use_ok 'PublicInbox::Import';
@@ -57,38 +46,18 @@ Date: Thu, 01 Jan 1970 06:06:06 +0000
 
 nntp
 EOF
-               $mime->header_set('List-Id', "<$addr>");
+
                my $git = PublicInbox::Git->new($maindir);
                my $im = PublicInbox::Import->new($git, 'test', $addr);
                $im->add($mime);
                $im->done($mime);
        }
        ok($sock, 'sock created');
-       $! = 0;
-       my $fl = fcntl($sock, F_GETFD, 0);
-       ok(! $!, 'no error from fcntl(F_GETFD)');
-       is($fl, FD_CLOEXEC, 'cloexec set by default (Perl behavior)');
-       $pid = fork;
-       if ($pid == 0) {
-               use POSIX qw(dup2);
-               # pretend to be systemd
-               fcntl($sock, F_SETFD, $fl &= ~FD_CLOEXEC);
-               dup2(fileno($sock), 3) or die "dup2 failed: $!\n";
-               $ENV{LISTEN_PID} = $$;
-               $ENV{LISTEN_FDS} = 1;
-               exec $httpd, "--stdout=$out", "--stderr=$err";
-               die "FAIL: $!\n";
-       }
-       ok(defined $pid, 'forked httpd process successfully');
-       $! = 0;
-       fcntl($sock, F_SETFD, $fl |= FD_CLOEXEC);
-       ok(! $!, 'no error from fcntl(F_SETFD)');
+       my $cmd = [ $httpd, "--stdout=$out", "--stderr=$err" ];
+       $pid = spawn_listener(undef, $cmd, [$sock]);
        my $host = $sock->sockhost;
        my $port = $sock->sockport;
-       my $conn = IO::Socket::INET->new(PeerAddr => $host,
-                               PeerPort => $port,
-                               Proto => 'tcp',
-                               Type => SOCK_STREAM);
+       my $conn = tcp_connect($sock);
        ok($conn, 'connected');
        ok($conn->write("GET / HTTP/1.0\r\n\r\n"), 'wrote data to socket');
        {
@@ -119,6 +88,23 @@ EOF
                'fsck on cloned directory successful');
 }
 
+SKIP: {
+       skip 'TCP_DEFER_ACCEPT is Linux-only', 1 if $^O ne 'linux';
+       my $var = Socket::TCP_DEFER_ACCEPT();
+       defined(my $x = getsockopt($sock, IPPROTO_TCP, $var)) or die;
+       ok(unpack('i', $x) > 0, 'TCP_DEFER_ACCEPT set');
+};
+SKIP: {
+       skip 'SO_ACCEPTFILTER is FreeBSD-only', 1 if $^O ne 'freebsd';
+       if (system('kldstat -m accf_http >/dev/null') != 0) {
+               skip 'accf_http not loaded: kldload accf_http', 1;
+       }
+       require PublicInbox::Daemon;
+       my $var = PublicInbox::Daemon::SO_ACCEPTFILTER();
+       my $x = getsockopt($sock, SOL_SOCKET, $var);
+       like($x, qr/\Ahttpready\0+\z/, 'got httpready accf for HTTP');
+};
+
 done_testing();
 
 1;