X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=t%2Fnntpd.t;h=34e9e1b45462675d175f807fc6a1bdc38477334f;hp=a3d974cfd2d92b6b6f1c995e9c720cc6287f0ce7;hb=1c3e60b66e01df89afdf74990a849a5a7386f9c7;hpb=305d728977def1df9ab57778f9cad9dd834ce73d diff --git a/t/nntpd.t b/t/nntpd.t index a3d974cf..34e9e1b4 100644 --- a/t/nntpd.t +++ b/t/nntpd.t @@ -1,25 +1,20 @@ -# Copyright (C) 2015-2020 all contributors +#!perl -w +# Copyright (C) all contributors # License: AGPL-3.0+ -use strict; -use warnings; -use Test::More; -use PublicInbox::TestCommon; -use PublicInbox::Spawn qw(which); +use strict; use v5.10.1; use PublicInbox::TestCommon; require_mods(qw(DBD::SQLite)); -require PublicInbox::InboxWritable; use PublicInbox::Eml; -use IO::Socket; use Socket qw(IPPROTO_TCP TCP_NODELAY); use Net::NNTP; use Sys::Hostname; use POSIX qw(_exit); use Digest::SHA; -use_ok 'PublicInbox::Msgmap'; # t/nntpd-v2.t wraps this for v2 my $version = $ENV{PI_TEST_VERSION} || 1; require_git('2.6') if $version == 2; -my $lsof = which('lsof'); +use_ok 'PublicInbox::Msgmap'; +my $lsof = require_cmd('lsof', 1); my $fast_idle = eval { require Linux::Inotify2; 1 } // eval { require IO::KQueue; 1 }; @@ -27,48 +22,14 @@ my ($tmpdir, $for_destroy) = tmpdir(); my $home = "$tmpdir/pi-home"; my $err = "$tmpdir/stderr.log"; my $out = "$tmpdir/stdout.log"; -my $inboxdir = "$tmpdir/main"; -my $otherdir = "$tmpdir/other"; +my $inboxdir = "$tmpdir/inbox"; my $group = 'test-nntpd'; my $addr = $group . '@example.com'; - -my %opts; my $sock = tcp_server(); +my $host_port = tcp_host_port($sock); my $td; -my $len; -my $ibx = { - inboxdir => $inboxdir, - name => $group, - version => $version, - -primary_address => $addr, - indexlevel => 'basic', -}; -$ibx = PublicInbox::Inbox->new($ibx); -{ - local $ENV{HOME} = $home; - my @cmd = ('-init', $group, $inboxdir, 'http://example.com/abc', $addr, - "-V$version", '-Lbasic', '--newsgroup', $group); - ok(run_script(\@cmd), "init $group"); - - @cmd = ('-init', 'xyz', $otherdir, 'http://example.com/xyz', - 'e@example.com', "-V$version", qw(-Lbasic --newsgroup x.y.z)); - ok(run_script(\@cmd), 'init xyz'); - is(xsys([qw(git config -f), "$home/.public-inbox/config", - qw(publicinboxmda.spamcheck none)]), 0, 'disable spamcheck'); - - open(my $fh, '<', 't/utf8.eml') or BAIL_OUT("open t/utf8.eml: $!"); - my $env = { ORIGINAL_RECIPIENT => 'e@example.com' }; - run_script([qw(-mda --no-precheck)], $env, { 0 => $fh }) or - BAIL_OUT('-mda delivery'); - - my $len; - $ibx = PublicInbox::InboxWritable->new($ibx); - my $im = $ibx->importer(0); - - # ensure successful message delivery - { - my $mime = PublicInbox::Eml->new(<new(< From: =?utf-8?Q?El=C3=A9anor?= Cc: $addr @@ -81,25 +42,51 @@ References: This is a test message for El\xc3\xa9anor EOF - my $list_id = $addr; - $list_id =~ s/@/./; - $mime->header_set('List-Id', "<$list_id>"); - my $str = $mime->as_string; - $str =~ s/(?add($mime); - $im->done; - if ($version == 1) { - ok(run_script(['-index', $ibx->{inboxdir}]), - 'indexed v1'); - } - } +my $list_id = $addr; +$list_id =~ s/@/./; +$eml->header_set('List-Id', "<$list_id>"); +my $str = $eml->as_string; +$str =~ s/(? $version, indexlevel => 'basic', + tmpdir => $inboxdir, sub { + my ($im, $ibx) = @_; + $im->add($eml) or BAIL_OUT; +}; +undef $eml; +my $other = create_inbox "other$version", version => $version, + indexlevel => 'basic', sub { + my ($im) = @_; + $im->add(eml_load 't/utf8.eml') or BAIL_OUT; +}; - ok($sock, 'sock created'); +local $ENV{HOME} = $home; +mkdir $home or BAIL_OUT $!; +mkdir "$home/.public-inbox" or BAIL_OUT $!; +open my $cfgfh, '>', "$home/.public-inbox/config" or BAIL_OUT $!; +print $cfgfh <{inboxdir} + url = http://example.com/xyz + address = e\@example.com + indexlevel = basic + newsgroup = x.y.z +[publicinboxMda] + spamcheck = none +EOF +close $cfgfh or BAIL_OUT; + +{ 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; ok(delete $list->{'x.y.z'}, 'deleted x.y.z group'); @@ -260,12 +247,9 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000 my $long_hdr = 'for-leafnode-'.('y'x200).'@example.com'; $for_leafnode->header_set('Message-ID', "<$long_hdr>"); + my $im = $ibx->importer(0); $im->add($for_leafnode); $im->done; - if ($version == 1) { - 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/; ok(scalar(grep(/$expect/, @$hdr)), 'Message-ID not folded'); @@ -295,6 +279,8 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000 'cross newsgroup BODY by Message-ID'); ok($n->head(''), 'cross newsgroup HEAD by Message-ID'); + is($n->xpath(''), 'x.y.z/1', 'xpath hit'); + is($n->xpath(''), undef, 'xpath miss'); # pipelined requests: { @@ -347,13 +333,14 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000 # -compact requires Xapian SKIP: { require_mods('Search::Xapian', 2); - which('xapian-compact') or skip 'xapian-compact missing', 2; + have_xapian_compact or skip 'xapian-compact missing', 2; is(xsys(qw(git config), "--file=$home/.public-inbox/config", "publicinbox.$group.indexlevel", 'medium'), 0, 'upgraded indexlevel'); my $ex = eml_load('t/data/0001.patch'); is($n->article($ex->header('Message-ID')), undef, 'article did not exist'); + my $im = $ibx->importer(0); $im->add($ex); $im->done; { @@ -371,10 +358,11 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000 $lsof or skip 'lsof missing', 1; ($^O =~ /\A(?:linux)\z/) or skip "lsof /(deleted)/ check untested on $^O", 1; - my @of = xqx([$lsof, '-p', $td->{pid}], undef, $noerr); - is(scalar(grep(/\(deleted\)/, @of)), 0, 'no deleted files'); + my @lsof = xqx([$lsof, '-p', $td->{pid}], undef, $noerr); + my $d = [ grep(/\(deleted\)/, @lsof) ]; + is_deeply($d, [], 'no deleted files') or diag explain($d); }; - SKIP: { test_watch($tmpdir, $sock, $group) }; + SKIP: { test_watch($tmpdir, $host_port, $group) }; { setsockopt($s, IPPROTO_TCP, TCP_NODELAY, 1); syswrite($s, 'HDR List-id 1-'); @@ -415,7 +403,7 @@ sub read_til_dot { } sub test_watch { - my ($tmpdir, $sock, $group) = @_; + my ($tmpdir, $host_port, $group) = @_; use_ok 'PublicInbox::Watch'; use_ok 'PublicInbox::InboxIdle'; use_ok 'PublicInbox::Config'; @@ -430,8 +418,7 @@ sub test_watch { my $url = "http://example.com/i1"; my $inboxdir = "$tmpdir/watchnntp"; my $cmd = ['-init', '-V1', '-Lbasic', $name, $inboxdir, $url, $addr]; - my ($ihost, $iport) = ($sock->sockhost, $sock->sockport); - my $nntpurl = "nntp://$ihost:$iport/$group"; + my $nntpurl = "nntp://$host_port/$group"; run_script($cmd) or BAIL_OUT("init $name"); xsys(qw(git config), "--file=$home/.public-inbox/config", "publicinbox.$name.watch", @@ -452,7 +439,7 @@ sub test_watch { my $w = start_script(['-watch'], undef, { 2 => $err_wr }); diag 'waiting for initial fetch...'; - PublicInbox::DS->EventLoop; + PublicInbox::DS::event_loop(); diag 'inbox unlocked on initial fetch'; $w->kill; $w->join; @@ -460,7 +447,7 @@ sub test_watch { $cfg->each_inbox(sub { shift->unsubscribe_unlock('ident') }); $ii->close; PublicInbox::DS->Reset; - my @err = grep(!/^I:/, <$err>); + my @err = grep(!/^(?:I:|#)/, <$err>); is(@err, 0, 'no warnings/errors from -watch'.join(' ', @err)); my @ls = xqx(['git', "--git-dir=$inboxdir", qw(ls-tree -r HEAD)]); isnt(scalar(@ls), 0, 'imported something');