run update-copyrights from gnulib for 2019

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

diff --git a/t/nntpd.t b/t/nntpd.t
index 6cba2be435089207d7ad8a33d76b23f11d417461..153204dfdc14d39e3393e451b43dbfc15661b7bb 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;
@@ -36,14 +36,8 @@ SKIP: {
        use_ok 'PublicInbox::V2Writable';
 }
 
-my %opts = (
-       LocalAddr => '127.0.0.1',
-       ReuseAddr => 1,
-       Proto => 'tcp',
-       Type => SOCK_STREAM,
-       Listen => 1024,
-);
-my $sock = IO::Socket::INET->new(%opts);
+my %opts;
+my $sock = tcp_server();
 my $pid;
 my $len;
 END { kill 'TERM', $pid if defined $pid };
@@ -106,15 +100,25 @@ 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');
-       ok(!$n->starttls, 'STARTTLS fails when unconfigured');
-       is($n->code, 580, 'got 580 code on server w/o TLS');
+       # 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);
+               eval {
+                       require IO::Socket::SSL;
+                       IO::Socket::SSL->VERSION(2.007);
+               } or skip('IO::Socket::SSL <2.007 not supported by Net::NNTP');
+               ok(!$n->starttls, 'STARTTLS fails when unconfigured');
+               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,
@@ -127,22 +131,32 @@ 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);
+       like($buf, qr/\r\nVERSION 2\r\n/s, 'CAPABILITIES works');
+       unlike($buf, qr/STARTTLS/s, 'STARTTLS not advertised');
+       my $deflate_capa = qr/\r\nCOMPRESS DEFLATE\r\n/;
+       if (eval { require Compress::Raw::Zlib }) {
+               like($buf, $deflate_capa, 'DEFLATE advertised');
+       } else {
+               unlike($buf, $deflate_capa,
+                       'DEFLATE not advertised (Compress::Raw::Zlib missing)');
+       }
 
        syswrite($s, "NEWGROUPS 19990424 000000 GMT\r\n");
        $buf = read_til_dot($s);