Merge remote-tracking branch 'origin/nntp-compress'

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

diff --git a/t/nntpd.t b/t/nntpd.t
index bf5bb883f728dcb8f500ff67b831962e8b40c174..e264fa6b5abbbfe255291b22670cc6952fdb3d94 100644 (file)
--- a/t/nntpd.t
+++ b/t/nntpd.t
@@ -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 };
@@ -110,6 +104,10 @@ EOF
        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');
        };
@@ -149,6 +147,18 @@ EOF
                '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);
        like($buf, qr/\A231 list of /, 'newgroups OK');