www: drop --subject from "git send-email" instructions

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

diff --git a/t/httpd.t b/t/httpd.t
index 2fc28355e97851f66b8f3adf3f39bb88c9db190e..aa60121031419d49b6ca1b2ab66ed5b90ff3c542 100644 (file)
--- a/t/httpd.t
+++ b/t/httpd.t
@@ -1,8 +1,8 @@
+#!perl -w
 # Copyright (C) 2016-2021 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;
+use v5.10.1;
 use PublicInbox::TestCommon;
 use PublicInbox::Eml;
 use Socket qw(IPPROTO_TCP SOL_SOCKET);
@@ -13,22 +13,15 @@ my ($tmpdir, $for_destroy) = tmpdir();
 my $home = "$tmpdir/pi-home";
 my $err = "$tmpdir/stderr.log";
 my $out = "$tmpdir/stdout.log";
-my $maindir = "$tmpdir/main.git";
+my $inboxdir = "$tmpdir/i.git";
 my $group = 'test-httpd';
 my $addr = $group . '@example.com';
-my $cfgpfx = "publicinbox.$group";
 my $sock = tcp_server();
 my $td;
-use_ok 'PublicInbox::Git';
-use_ok 'PublicInbox::Import';
 {
-       local $ENV{HOME} = $home;
-       my $cmd = [ '-init', $group, $maindir, 'http://example.com/', $addr ];
-       ok(run_script($cmd), 'init ran properly');
-
-       # ensure successful message delivery
-       {
-               my $mime = PublicInbox::Eml->new(<<EOF);
+       create_inbox 'test', tmpdir => $inboxdir, sub {
+               my ($im, $ibx) = @_;
+               $im->add(PublicInbox::Eml->new(<<EOF)) or BAIL_OUT;
 From: Me <me\@example.com>
 To: You <you\@example.com>
 Cc: $addr
@@ -38,24 +31,23 @@ Date: Thu, 01 Jan 1970 06:06:06 +0000
 
 nntp
 EOF
-
-               my $git = PublicInbox::Git->new($maindir);
-               my $im = PublicInbox::Import->new($git, 'test', $addr);
-               $im->add($mime);
-               $im->done($mime);
-       }
-       ok($sock, 'sock created');
+       };
+       my $i2 = create_inbox 'test-2', sub {
+               my ($im, $ibx) = @_;
+               $im->add(eml_load('t/plack-qp.eml')) or xbail '->add';
+       };
+       local $ENV{HOME} = $home;
+       my $cmd = [ '-init', $group, $inboxdir, 'http://example.com/', $addr ];
+       ok(run_script($cmd), 'init ran properly');
        $cmd = [ '-httpd', '-W0', "--stdout=$out", "--stderr=$err" ];
        $td = start_script($cmd, undef, { 3 => $sock });
-       my $host = $sock->sockhost;
-       my $port = $sock->sockport;
+       my $http_pfx = 'http://'.tcp_host_port($sock);
        {
                my $bad = tcp_connect($sock);
                print $bad "GETT / HTTP/1.0\r\n\r\n" or die;
                like(<$bad>, qr!\AHTTP/1\.[01] 405\b!, 'got 405 on bad req');
        }
        my $conn = tcp_connect($sock);
-       ok($conn, 'connected');
        ok($conn->write("GET / HTTP/1.0\r\n\r\n"), 'wrote data to socket');
        {
                my $buf;
@@ -65,17 +57,38 @@ EOF
        }
 
        is(xsys(qw(git clone -q --mirror),
-                       "http://$host:$port/$group", "$tmpdir/clone.git"),
+                       "$http_pfx/$group", "$tmpdir/clone.git"),
                0, 'smart clone successful');
 
        # ensure dumb cloning works, too:
-       is(xsys('git', "--git-dir=$maindir",
+       is(xsys('git', "--git-dir=$inboxdir",
                qw(config http.uploadpack false)),
                0, 'disable http.uploadpack');
        is(xsys(qw(git clone -q --mirror),
-                       "http://$host:$port/$group", "$tmpdir/dumb.git"),
+                       "$http_pfx/$group", "$tmpdir/dumb.git"),
                0, 'clone successful');
 
+       # test config reload
+       my $cfg = "$home/.public-inbox/config";
+       open my $fh, '>>', $cfg or xbail "open: $!";
+       print $fh <<EOM or xbail "print $!";
+[publicinbox "test-2"]
+       inboxdir = $i2->{inboxdir}
+       address = test-2\@example.com
+       url = https://example.com/test-2
+EOM
+       close $fh or xbail "close $!";
+       $td->kill('HUP') or BAIL_OUT "failed to kill -httpd: $!";
+       tick; # wait for HUP to take effect
+       my $buf = do {
+               my $c2 = tcp_connect($sock);
+               $c2->write("GET /test-2/qp\@example.com/raw HTTP/1.0\r\n\r\n")
+                                       or xbail "c2 write: $!";
+               local $/;
+               <$c2>
+       };
+       like($buf, qr!\AHTTP/1\.0 200\b!s, 'got 200 after reload for test-2');
+
        ok($td->kill, 'killed httpd');
        $td->join;
 
@@ -96,11 +109,11 @@ SKIP: {
                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);
+       ok(defined($PublicInbox::Daemon::SO_ACCEPTFILTER),
+               'SO_ACCEPTFILTER defined');
+       my $x = getsockopt($sock, SOL_SOCKET,
+                       $PublicInbox::Daemon::SO_ACCEPTFILTER);
        like($x, qr/\Ahttpready\0+\z/, 'got httpready accf for HTTP');
 };
 
-done_testing();
-
-1;
+done_testing;