Merge remote-tracking branch 'origin/email-simple-mem' into master

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

diff --git a/t/nntpd.t b/t/nntpd.t
index a95fb6fca8801d66ac4a97efa61bdd342fa0a8ac..bf5bb883f728dcb8f500ff67b831962e8b40c174 100644 (file)
--- a/t/nntpd.t
+++ b/t/nntpd.t
@@ -91,7 +91,7 @@ EOF
                $im->add($mime);
                $im->done;
                if ($version == 1) {
-                       my $s = PublicInbox::SearchIdx->new($mainrepo, 1);
+                       my $s = PublicInbox::SearchIdx->new($ibx, 1);
                        $s->index_sync;
                }
        }
@@ -107,6 +107,13 @@ EOF
        is_deeply([$n->group($group)], [ qw(0 1 1), $group ], 'GROUP works');
        is_deeply($n->listgroup($group), [1], 'listgroup OK');
 
+       SKIP: {
+               $n->can('starttls') or
+                       skip('Net::NNTP too old to support STARTTLS', 2);
+               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',
@@ -243,7 +250,7 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000
                $im->add($for_leafnode);
                $im->done;
                if ($version == 1) {
-                       my $s = PublicInbox::SearchIdx->new($mainrepo, 1);
+                       my $s = PublicInbox::SearchIdx->new($ibx, 1);
                        $s->index_sync;
                }
                my $hdr = $n->head("<$long_hdr>");