config: support "inboxdir" in addition to "mainrepo"

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

diff --git a/t/nntpd.t b/t/nntpd.t
index e264fa6b5abbbfe255291b22670cc6952fdb3d94..462e2da97b9922c6c165c5e59977c543fd84e472 100644 (file)
--- a/t/nntpd.t
+++ b/t/nntpd.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
@@ -26,7 +26,7 @@ my $tmpdir = tempdir('pi-nntpd-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 my $home = "$tmpdir/pi-home";
 my $err = "$tmpdir/stderr.log";
 my $out = "$tmpdir/stdout.log";
-my $mainrepo = "$tmpdir/main.git";
+my $inboxdir = "$tmpdir/main.git";
 my $group = 'test-nntpd';
 my $addr = $group . '@example.com';
 my $nntpd = 'blib/script/public-inbox-nntpd';
@@ -43,7 +43,7 @@ my $len;
 END { kill 'TERM', $pid if defined $pid };
 
 my $ibx = {
-       mainrepo => $mainrepo,
+       inboxdir => $inboxdir,
        name => $group,
        version => $version,
        -primary_address => $addr,
@@ -52,7 +52,7 @@ my $ibx = {
 $ibx = PublicInbox::Inbox->new($ibx);
 {
        local $ENV{HOME} = $home;
-       my @cmd = ($init, $group, $mainrepo, 'http://example.com/', $addr);
+       my @cmd = ($init, $group, $inboxdir, 'http://example.com/', $addr);
        push @cmd, "-V$version", '-Lbasic';
        is(system(@cmd), 0, 'init OK');
        is(system(qw(git config), "--file=$home/.public-inbox/config",
@@ -100,7 +100,14 @@ EOF
        is_deeply($list, { $group => [ qw(1 1 n) ] }, 'LIST works');
        is_deeply([$n->group($group)], [ qw(0 1 1), $group ], 'GROUP works');
        is_deeply($n->listgroup($group), [1], 'listgroup OK');
+       # TODO: Net::NNTP::listgroup does not support range at the moment
 
+       {
+               my $expect = [ qw(Subject: From: Date: Message-ID:
+                               References: Bytes: Lines: Xref:full) ];
+               is_deeply($n->overview_fmt, $expect,
+                       'RFC3977 8.4.2 compliant LIST OVERVIEW.FMT');
+       }
        SKIP: {
                $n->can('starttls') or
                        skip('Net::NNTP too old to support STARTTLS', 2);
@@ -112,12 +119,6 @@ EOF
                is($n->code, 580, 'got 580 code on server w/o TLS');
        };
 
-       %opts = (
-               PeerAddr => $host_port,
-               Proto => 'tcp',
-               Type => SOCK_STREAM,
-               Timeout => 1,
-       );
        my $mid = '<nntp@example.com>';
        my %xhdr = (
                'message-id' => $mid,
@@ -130,22 +131,20 @@ EOF
                'references' => '<reftabsqueezed>',
        );
 
-       my $s = IO::Socket::INET->new(%opts);
+       my $s = tcp_connect($sock);
        sysread($s, my $buf, 4096);
        is($buf, "201 " . hostname . " ready - post via email\r\n",
                'got greeting');
-       $s->autoflush(1);
 
        ok(syswrite($s, "   \r\n"), 'wrote spaces');
        ok(syswrite($s, "\r\n"), 'wrote nothing');
        syswrite($s, "NEWGROUPS\t19990424 000000 \033GMT\007\r\n");
        is(0, sysread($s, $buf, 4096), 'GOT EOF on cntrl');
 
-       $s = IO::Socket::INET->new(%opts);
+       $s = tcp_connect($sock);
        sysread($s, $buf, 4096);
        is($buf, "201 " . hostname . " ready - post via email\r\n",
                'got greeting');
-       $s->autoflush(1);
 
        syswrite($s, "CAPABILITIES\r\n");
        $buf = read_til_dot($s);