X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fnntpd.t;h=2d7280a50d5e8a466c9a36649a916c8603aa293a;hb=47f8836273133fb4a13e895feff7f7ee34ae7109;hp=bebecc6920d947939f644bae675123fcd1b3f4c3;hpb=aca2d958e5bf80d19d69f66d2c1ec6809fece29a;p=public-inbox.git diff --git a/t/nntpd.t b/t/nntpd.t index bebecc69..2d7280a5 100644 --- a/t/nntpd.t +++ b/t/nntpd.t @@ -1,36 +1,29 @@ -# Copyright (C) 2015-2018 all contributors +# Copyright (C) 2015-2020 all contributors # License: AGPL-3.0+ use strict; use warnings; use Test::More; -foreach my $mod (qw(DBD::SQLite)) { - eval "require $mod"; - plan skip_all => "$mod missing for nntpd.t" if $@; -} -require PublicInbox::SearchIdx; -require PublicInbox::Msgmap; +use PublicInbox::TestCommon; +use PublicInbox::Spawn qw(which); +require_mods(qw(DBD::SQLite)); require PublicInbox::InboxWritable; use Email::Simple; use IO::Socket; use Socket qw(IPPROTO_TCP TCP_NODELAY); -use File::Temp qw/tempdir/; use Net::NNTP; use Sys::Hostname; -require './t/common.perl'; # FIXME: make easier to test both versions my $version = $ENV{PI_TEST_VERSION} || 2; require_git('2.6') if $version == 2; -my $tmpdir = tempdir('pi-nntpd-XXXXXX', TMPDIR => 1, CLEANUP => 1); +my ($tmpdir, $for_destroy) = tmpdir(); 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'; -my $init = 'blib/script/public-inbox-init'; SKIP: { skip "git 2.6+ required for V2Writable", 1 if $version == 1; use_ok 'PublicInbox::V2Writable'; @@ -38,12 +31,11 @@ SKIP: { my %opts; my $sock = tcp_server(); -my $pid; +my $td; my $len; -END { kill 'TERM', $pid if defined $pid }; my $ibx = { - mainrepo => $mainrepo, + inboxdir => $inboxdir, name => $group, version => $version, -primary_address => $addr, @@ -52,10 +44,10 @@ 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", + ok(run_script(\@cmd), 'init OK'); + is(xsys(qw(git config), "--file=$home/.public-inbox/config", "publicinbox.$group.newsgroup", $group), 0, 'enabled newsgroup'); my $len; @@ -85,21 +77,21 @@ EOF $im->add($mime); $im->done; if ($version == 1) { - my $s = PublicInbox::SearchIdx->new($ibx, 1); - $s->index_sync; + ok(run_script(['-index', $ibx->{inboxdir}]), + 'indexed v1'); } } ok($sock, 'sock created'); - my $cmd = [ $nntpd, "--stdout=$out", "--stderr=$err" ]; - $pid = spawn_listener(undef, $cmd, [ $sock ]); - ok(defined $pid, 'forked nntpd process successfully'); + my $cmd = [ '-nntpd', '-W0', "--stdout=$out", "--stderr=$err" ]; + $td = start_script($cmd, undef, { 3 => $sock }); my $host_port = $sock->sockhost . ':' . $sock->sockport; my $n = Net::NNTP->new($host_port); my $list = $n->list; 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: @@ -110,20 +102,16 @@ EOF SKIP: { $n->can('starttls') or skip('Net::NNTP too old to support STARTTLS', 2); + require_mods('IO::Socket::SSL', 2); eval { - require IO::Socket::SSL; IO::Socket::SSL->VERSION(2.007); - } or skip('IO::Socket::SSL <2.007 not supported by Net::NNTP'); + } or skip(<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 = ''; my %xhdr = ( 'message-id' => $mid, @@ -136,22 +124,20 @@ EOF 'references' => '', ); - 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); @@ -266,8 +252,8 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000 $im->add($for_leafnode); $im->done; if ($version == 1) { - my $s = PublicInbox::SearchIdx->new($ibx, 1); - $s->index_sync; + ok(run_script(['-index', $ibx->{inboxdir}]), + 'indexed v1'); } my $hdr = $n->head("<$long_hdr>"); my $expect = qr/\AMessage-ID: /i . qr/\Q<$long_hdr>\E/; @@ -281,7 +267,7 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000 $for_leafnode->header_set('Message-ID', @mids); $for_leafnode->body_set('not-a-dupe'); my $warn = ''; - $SIG{__WARN__} = sub { $warn .= join('', @_) }; + local $SIG{__WARN__} = sub { $warn .= join('', @_) }; $im->add($for_leafnode); $im->done; like($warn, qr/reused/, 'warned for reused MID'); @@ -314,7 +300,12 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000 is($? >> 8, 0, 'no errors'); } SKIP: { - my @of = `lsof -p $pid 2>/dev/null`; + if ($INC{'Search/Xapian.pm'} && ($ENV{TEST_RUN_MODE}//2)) { + skip 'Search/Xapian.pm pre-loaded (by t/run.perl?)', 1; + } + my $lsof = which('lsof') or skip 'lsof missing', 1; + my $rdr = { 2 => \(my $null) }; + my @of = xqx([$lsof, '-p', $td->{pid}], undef, $rdr); skip('lsof broken', 1) if (!scalar(@of) || $?); my @xap = grep m!Search/Xapian!, @of; is_deeply(\@xap, [], 'Xapian not loaded in nntpd'); @@ -323,7 +314,7 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000 setsockopt($s, IPPROTO_TCP, TCP_NODELAY, 1); syswrite($s, 'HDR List-id 1-'); select(undef, undef, undef, 0.15); - ok(kill('TERM', $pid), 'killed nntpd'); + ok($td->kill, 'killed nntpd'); select(undef, undef, undef, 0.15); syswrite($s, "\r\n"); $buf = ''; @@ -337,7 +328,7 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000 } $n = $s = undef; - is($pid, waitpid($pid, 0), 'nntpd exited successfully'); + $td->join; my $eout = eval { local $/; open my $fh, '<', $err or die "open $err failed: $!"; @@ -347,6 +338,7 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000 unlike($eout, qr/wide/i, 'no Wide character warnings'); } +$td = undef; done_testing(); sub read_til_dot {