No ext_urls

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

diff --git a/t/nntpd-tls.t b/t/nntpd-tls.t
index 2c09d34e5b452fadebd31c987ed4082903e79caa..2a76867a290b44bebc67fbda817927e6eb452f16 100644 (file)
--- a/t/nntpd-tls.t
+++ b/t/nntpd-tls.t
@@ -146,6 +146,15 @@ for my $args (
        is(sysread($slow, my $eof, 4096), 0, 'got EOF');
        $slow = undef;
 
+       test_lei(sub {
+               lei_ok qw(ls-mail-source), "nntp://$starttls_addr",
+                       \'STARTTLS not used by default';
+               ok(!lei(qw(ls-mail-source -c nntp.starttls=true),
+                       "nntp://$starttls_addr"), 'STARTTLS verify fails');
+               like $lei_err, qr/STARTTLS requested/,
+                       'STARTTLS noted in stderr';
+       });
+
        SKIP: {
                skip 'TCP_DEFER_ACCEPT is Linux-only', 2 if $^O ne 'linux';
                my $var = eval { Socket::TCP_DEFER_ACCEPT() } // 9;
@@ -160,10 +169,11 @@ for my $args (
                        skip 'accf_data not loaded? kldload accf_data', 2;
                }
                require PublicInbox::Daemon;
-               my $var = PublicInbox::Daemon::SO_ACCEPTFILTER();
-               my $x = getsockopt($nntps, SOL_SOCKET, $var);
+               my $x = getsockopt($nntps, SOL_SOCKET,
+                               $PublicInbox::Daemon::SO_ACCEPTFILTER);
                like($x, qr/\Adataready\0+\z/, 'got dataready accf for NNTPS');
-               $x = getsockopt($starttls, IPPROTO_TCP, $var);
+               $x = getsockopt($starttls, IPPROTO_TCP,
+                               $PublicInbox::Daemon::SO_ACCEPTFILTER);
                is($x, undef, 'no BSD accept filter for plain NNTP');
        };