X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fnntpd.t;h=69f72ce12163ef453f8171a3494b23b326b7cdf8;hb=0283273a14e1871955f6a9132f4f3f7884ec8a3f;hp=aa686e9c5a22435bb778d59286e831f538be2119;hpb=7f3f4923ec711ec97a1204ec2c080e219f50ff3b;p=public-inbox.git diff --git a/t/nntpd.t b/t/nntpd.t index aa686e9c..69f72ce1 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 PublicInbox::Eml; 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; @@ -65,7 +57,7 @@ $ibx = PublicInbox::Inbox->new($ibx); # ensure successful message delivery { - my $mime = Email::MIME->new(<new(< From: =?utf-8?Q?El=C3=A9anor?= Cc: $addr @@ -85,15 +77,14 @@ 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; @@ -111,10 +102,12 @@ 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'); }; @@ -248,7 +241,7 @@ EOF ok($date <= $t1, 'valid date before stop'); } if ('leafnode interop') { - my $for_leafnode = PublicInbox::MIME->new(<<""); + my $for_leafnode = PublicInbox::Eml->new(<<""); From: longheader\@example.com To: $addr Subject: none @@ -259,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/; @@ -274,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'); @@ -307,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'); @@ -316,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 = ''; @@ -330,16 +328,17 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000 } $n = $s = undef; - is($pid, waitpid($pid, 0), 'nntpd exited successfully'); - my $eout = eval { - local $/; + $td->join; + is($?, 0, 'no error in exited process'); + my $eout = do { open my $fh, '<', $err or die "open $err failed: $!"; + local $/; <$fh>; }; - is($?, 0, 'no error in exited process'); unlike($eout, qr/wide/i, 'no Wide character warnings'); } +$td = undef; done_testing(); sub read_til_dot {