bundle Danga::Socket and Sys::Syscall

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

diff --git a/t/nntpd.t b/t/nntpd.t
index 960e83c182868c4c74e5f08643fd62f394395606..ecfd74f7c0c120823005ef4e88e0791821e47123 100644 (file)
--- a/t/nntpd.t
+++ b/t/nntpd.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 use Test::More;
-foreach my $mod (qw(DBD::SQLite Search::Xapian Danga::Socket)) {
+foreach my $mod (qw(DBD::SQLite Search::Xapian PublicInbox::DS)) {
        eval "require $mod";
        plan skip_all => "$mod missing for nntpd.t" if $@;
 }
@@ -12,10 +12,15 @@ require PublicInbox::Msgmap;
 use Cwd;
 use Email::Simple;
 use IO::Socket;
-use Fcntl qw(FD_CLOEXEC F_SETFD F_GETFD);
 use Socket qw(SO_KEEPALIVE IPPROTO_TCP TCP_NODELAY);
 use File::Temp qw/tempdir/;
 use Net::NNTP;
+use Sys::Hostname;
+require './t/common.perl';
+
+# FIXME: make easier to test both versions
+my $version = $ENV{PI_VERSION} || 2;
+require_git('2.6') if $version == 2;
 
 my $tmpdir = tempdir('pi-nntpd-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 my $home = "$tmpdir/pi-home";
@@ -29,10 +34,11 @@ my $init = 'blib/script/public-inbox-init';
 use_ok 'PublicInbox::Import';
 use_ok 'PublicInbox::Inbox';
 use_ok 'PublicInbox::Git';
-use_ok 'PublicInbox::V2Writable';
+SKIP: {
+       skip "git 2.6+ required for V2Writable", 1 if $version == 1;
+       use_ok 'PublicInbox::V2Writable';
+}
 
-# XXX FIXME: make it easier to test both versions
-my $version = int($ENV{PI_VERSION} || 1);
 my %opts = (
        LocalAddr => '127.0.0.1',
        ReuseAddr => 1,
@@ -100,25 +106,9 @@ EOF
        }
 
        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 $nntpd, "--stdout=$out", "--stderr=$err";
-               die "FAIL: $!\n";
-       }
+       my $cmd = [ $nntpd, "--stdout=$out", "--stderr=$err" ];
+       $pid = spawn_listener(undef, $cmd, [ $sock ]);
        ok(defined $pid, 'forked nntpd process successfully');
-       $! = 0;
-       fcntl($sock, F_SETFD, $fl |= FD_CLOEXEC);
-       ok(! $!, 'no error from fcntl(F_SETFD)');
        my $host_port = $sock->sockhost . ':' . $sock->sockport;
        my $n = Net::NNTP->new($host_port);
        my $list = $n->list;
@@ -140,13 +130,14 @@ EOF
                'from' => "El\xc3\xa9anor <me\@example.com>",
                'to' => "El\xc3\xa9anor <you\@example.com>",
                'cc' => $addr,
-               'xref' => "example.com $group:1",
+               'xref' => hostname . " $group:1",
                'references' => '<reftabsqueezed>',
        );
 
        my $s = IO::Socket::INET->new(%opts);
        sysread($s, my $buf, 4096);
-       is($buf, "201 server ready - post via email\r\n", 'got greeting');
+       is($buf, "201 " . hostname . " ready - post via email\r\n",
+               'got greeting');
        $s->autoflush(1);
 
        ok(syswrite($s, "   \r\n"), 'wrote spaces');
@@ -156,7 +147,8 @@ EOF
 
        $s = IO::Socket::INET->new(%opts);
        sysread($s, $buf, 4096);
-       is($buf, "201 server ready - post via email\r\n", 'got greeting');
+       is($buf, "201 " . hostname . " ready - post via email\r\n",
+               'got greeting');
        $s->autoflush(1);
 
        syswrite($s, "NEWGROUPS 19990424 000000 GMT\r\n");
@@ -193,7 +185,9 @@ EOF
                        '<nntp@example.com>',
                        '<reftabsqueezed>',
                        $len,
-                       '1' ] }, "XOVER range works");
+                       '1',
+                       'Xref: '. hostname . ' test-nntpd:1'] },
+               "XOVER range works");
 
        is_deeply($n->xover('1'), {
                '1' => ["Testing for El\xc3\xa9anor",
@@ -202,7 +196,9 @@ EOF
                        '<nntp@example.com>',
                        '<reftabsqueezed>',
                        $len,
-                       '1' ] }, "XOVER by article works");
+                       '1',
+                       'Xref: '. hostname . ' test-nntpd:1'] },
+               "XOVER by article works");
 
        is_deeply($n->head(1), $n->head('<nntp@example.com>'), 'HEAD OK');
        is_deeply($n->body(1), $n->body('<nntp@example.com>'), 'BODY OK');
@@ -222,7 +218,8 @@ EOF
                is($r[1], "0\tTesting for El\xc3\xa9anor\t" .
                        "El\xc3\xa9anor <me\@example.com>\t" .
                        "Thu, 01 Jan 1970 06:06:06 +0000\t" .
-                       "$mid\t<reftabsqueezed>\t$len\t1",
+                       "$mid\t<reftabsqueezed>\t$len\t1" .
+                       "\tXref: " . hostname . " test-nntpd:0",
                        'OVER by Message-ID works');
                is($r[2], '.', 'correctly terminated response');
        }
@@ -244,6 +241,27 @@ EOF
                ok($date <= $t1, 'valid date before stop');
        }
 
+       # pipelined requests:
+       {
+               my $nreq = 90;
+               syswrite($s, "GROUP $group\r\n");
+               my $res = <$s>;
+               my $rdr = fork;
+               if ($rdr == 0) {
+                       use POSIX qw(_exit);
+                       for (1..$nreq) {
+                               <$s> =~ /\A224 / or _exit(1);
+                               <$s> =~ /\A1/ or _exit(2);
+                               <$s> eq ".\r\n" or _exit(3);
+                       }
+                       _exit(0);
+               }
+               for (1..$nreq) {
+                       syswrite($s, "XOVER 1\r\n");
+               }
+               is($rdr, waitpid($rdr, 0), 'reader done');
+               is($? >> 8, 0, 'no errors');
+       }
        {
                setsockopt($s, IPPROTO_TCP, TCP_NODELAY, 1);
                syswrite($s, 'HDR List-id 1-');