nntp: xref: use ->ALL extindex if available

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

diff --git a/t/extsearch.t b/t/extsearch.t
index 8792fd9e96911a1f273f5372fed3289d5445560c..f9f74e5c9db3ad6cf1cb06a477ff3dcb94a28bb3 100644 (file)
--- a/t/extsearch.t
+++ b/t/extsearch.t
@@ -4,11 +4,15 @@
 use strict;
 use Test::More;
 use PublicInbox::TestCommon;
+use PublicInbox::Config;
 use Fcntl qw(:seek);
+my $json = PublicInbox::Config::json() or plan skip_all => 'JSON missing';
 require_git(2.6);
 require_mods(qw(DBD::SQLite Search::Xapian));
 use_ok 'PublicInbox::ExtSearch';
 use_ok 'PublicInbox::ExtSearchIdx';
+my $sock = tcp_server();
+my $host_port = $sock->sockhost . ':' . $sock->sockport;
 my ($home, $for_destroy) = tmpdir();
 local $ENV{HOME} = $home;
 mkdir "$home/.public-inbox" or BAIL_OUT $!;
@@ -23,26 +27,70 @@ my $v1addr = 'v1test@example.com';
 ok(run_script([qw(-init -V2 v2test --newsgroup v2.example), "$home/v2test",
        'http://example.com/v2test', $v2addr ]), 'v2test init');
 my $env = { ORIGINAL_RECIPIENT => $v2addr };
-open($fh, '<', 't/utf8.eml') or BAIL_OUT("open t/utf8.eml: $!");
+my $eml = eml_load('t/utf8.eml');
+
+$eml->header_set('List-Id', '<v2.example.com>');
+open($fh, '+>', undef) or BAIL_OUT $!;
+$fh->autoflush(1);
+print $fh $eml->as_string or BAIL_OUT $!;
+seek($fh, 0, SEEK_SET) or BAIL_OUT $!;
+
 run_script(['-mda', '--no-precheck'], $env, { 0 => $fh }) or BAIL_OUT '-mda';
 
-ok(run_script([qw(-init -V1 v1test), "$home/v1test",
+ok(run_script([qw(-init -V1 v1test --newsgroup v1.example), "$home/v1test",
        'http://example.com/v1test', $v1addr ]), 'v1test init');
-$env = { ORIGINAL_RECIPIENT => $v1addr };
+
+$eml->header_set('List-Id', '<v1.example.com>');
 seek($fh, 0, SEEK_SET) or BAIL_OUT $!;
+truncate($fh, 0) or BAIL_OUT $!;
+print $fh $eml->as_string or BAIL_OUT $!;
+seek($fh, 0, SEEK_SET) or BAIL_OUT $!;
+
+$env = { ORIGINAL_RECIPIENT => $v1addr };
 run_script(['-mda', '--no-precheck'], $env, { 0 => $fh }) or BAIL_OUT '-mda';
+
 run_script(['-index', "$home/v1test"]) or BAIL_OUT "index $?";
 
-ok(run_script([qw(-extindex --all), "$home/eindex"]), 'extindex init');
+ok(run_script([qw(-extindex --all), "$home/extindex"]), 'extindex init');
 
-my $es = PublicInbox::ExtSearch->new("$home/eindex");
+
+{ # TODO: -extindex should write this to config
+       open $fh, '>>', "$home/.public-inbox/config" or BAIL_OUT $!;
+       print $fh <<EOF or BAIL_OUT $!;
+; for ->ALL
+[extindex "all"]
+       topdir = $home/extindex
+EOF
+       close $fh or BAIL_OUT $!;
+
+       my $pi_cfg = PublicInbox::Config->new;
+       $pi_cfg->fill_all;
+       ok($pi_cfg->ALL, '->ALL');
+       my $ibx = $pi_cfg->{-by_newsgroup}->{'v2.example'};
+       my $ret = $pi_cfg->ALL->nntp_xref_for($ibx, $ibx->over->get_art(1));
+       is_deeply($ret, ['v1.example:1'], '->nntp_xref_for');
+}
+
+SKIP: {
+       require_mods(qw(Net::NNTP), 1);
+       my ($out, $err) = ("$home/nntpd.out.log", "$home/nntpd.err.log");
+       my $cmd = [ '-nntpd', '-W0' ]; #, "--stdout=$out", "--stderr=$err" ];
+       my $td = start_script($cmd, undef, { 3 => $sock });
+       my $n = Net::NNTP->new($host_port);
+       $n->group('v1.example');
+       my $res = $n->head(1);
+       @$res = grep(/^Xref: /, @$res);
+       like($res->[0], qr/ v1\.example:1 v2\.example:1/, 'nntp_xref works');
+}
+
+my $es = PublicInbox::ExtSearch->new("$home/extindex");
 {
        my $smsg = $es->over->get_art(1);
        ok($smsg, 'got first article');
        is($es->over->get_art(2), undef, 'only one added');
        my $xref3 = $es->over->get_xref3(1);
        like($xref3->[0], qr/\A\Qv2.example\E:1:/, 'order preserved 1');
-       like($xref3->[1], qr!\A\Q$home/v1test\E:1:!, 'order preserved 2');
+       like($xref3->[1], qr/\A\Qv1.example\E:1:/, 'order preserved 2');
        is(scalar(@$xref3), 2, 'only to entries');
 }
 
@@ -53,7 +101,7 @@ my $es = PublicInbox::ExtSearch->new("$home/eindex");
        my $env = { MAIL_EDITOR => "$^X -i -p -e 's/test message/BEST MSG/'" };
        my $cmd = [ qw(-edit -Ft/utf8.eml), "$home/v2test" ];
        ok(run_script($cmd, $env, $opt), '-edit');
-       ok(run_script([qw(-extindex --all), "$home/eindex"], undef, $opt),
+       ok(run_script([qw(-extindex --all), "$home/extindex"], undef, $opt),
                'extindex again');
        like($err, qr/discontiguous range/, 'warned about discontiguous range');
        my $msg1 = $es->over->get_art(1) or BAIL_OUT 'msg1 missing';
@@ -72,4 +120,10 @@ my $es = PublicInbox::ExtSearch->new("$home/eindex");
        isnt($x1->[0], $x2->[0], 'xref3 differs');
 }
 
+my $misc = $es->misc;
+my @it = $misc->mset('')->items;
+is(scalar(@it), 2, 'two inboxes');
+like($it[0]->get_document->get_data, qr/v2test/, 'docdata matched v2');
+like($it[1]->get_document->get_data, qr/v1test/, 'docdata matched v1');
+
 done_testing;