Merge branch 'learn'

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

diff --git a/t/v2writable.t b/t/v2writable.t
index 8f32fbe5d9c42e9abfd31e33ce70200c46ca03b6..bfe17d0a843a7b33ec4b17c1c3079c042cc312b2 100644 (file)
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2018-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
@@ -14,9 +14,9 @@ foreach my $mod (qw(DBD::SQLite Search::Xapian)) {
 }
 use_ok 'PublicInbox::V2Writable';
 umask 007;
-my $mainrepo = tempdir('pi-v2writable-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my $inboxdir = tempdir('pi-v2writable-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 my $ibx = {
-       mainrepo => $mainrepo,
+       inboxdir => $inboxdir,
        name => 'test-v2writable',
        version => 2,
        -primary_address => 'test@example.com',
@@ -36,9 +36,9 @@ my $mime = PublicInbox::MIME->create(
 my $im = PublicInbox::V2Writable->new($ibx, {nproc => 1});
 is($im->{shards}, 1, 'one shard when forced');
 ok($im->add($mime), 'ordinary message added');
-foreach my $f ("$mainrepo/msgmap.sqlite3",
-               glob("$mainrepo/xap*/*"),
-               glob("$mainrepo/xap*/*/*")) {
+foreach my $f ("$inboxdir/msgmap.sqlite3",
+               glob("$inboxdir/xap*/*"),
+               glob("$inboxdir/xap*/*/*")) {
        my @st = stat($f);
        my ($bn) = (split(m!/!, $f))[-1];
        is($st[2] & 07777, -f _ ? 0660 : 0770,
@@ -48,10 +48,10 @@ foreach my $f ("$mainrepo/msgmap.sqlite3",
 my $git0;
 
 if ('ensure git configs are correct') {
-       my @cmd = (qw(git config), "--file=$mainrepo/all.git/config",
+       my @cmd = (qw(git config), "--file=$inboxdir/all.git/config",
                qw(core.sharedRepository 0644));
        is(system(@cmd), 0, "set sharedRepository in all.git");
-       $git0 = PublicInbox::Git->new("$mainrepo/git/0.git");
+       $git0 = PublicInbox::Git->new("$inboxdir/git/0.git");
        chomp(my $v = $git0->qx(qw(config core.sharedRepository)));
        is($v, '0644', 'child repo inherited core.sharedRepository');
        chomp($v = $git0->qx(qw(config --bool repack.writeBitmaps)));
@@ -115,6 +115,7 @@ if ('ensure git configs are correct') {
 
 {
        $mime->header_set('Message-Id', '<abcde@1>', '<abcde@2>');
+       $mime->header_set('X-Alt-Message-Id', '<alt-id-for-nntp>');
        $mime->header_set('References', '<zz-mid@b>');
        ok($im->add($mime), 'message with multiple Message-ID');
        $im->done;
@@ -127,33 +128,40 @@ if ('ensure git configs are correct') {
        is($mset2->size, 1, 'message found by second MID');
        is((($mset1->items)[0])->get_docid, (($mset2->items)[0])->get_docid,
                'same document') if ($mset1->size);
+
+       my $alt = $srch->reopen->query('m:alt-id-for-nntp', { mset => 1 });
+       is($alt->size, 1, 'message found by alt MID (NNTP)');
+       is((($alt->items)[0])->get_docid, (($mset1->items)[0])->get_docid,
+               'same document') if ($mset1->size);
+       $mime->header_set('X-Alt-Message-Id');
+
+       my %uniq;
+       for my $mid (qw(abcde@1 abcde@2 alt-id-for-nntp)) {
+               my $msgs = $ibx->over->get_thread($mid);
+               my $key = join(' ', sort(map { $_->{num} } @$msgs));
+               $uniq{$key}++;
+       }
+       is(scalar(keys(%uniq)), 1, 'all alt Message-ID queries give same smsg');
+       is_deeply([values(%uniq)], [3], '3 queries, 3 results');
 }
 
 {
        use Net::NNTP;
-       use IO::Socket::INET;
-       my $err = "$mainrepo/stderr.log";
-       my $out = "$mainrepo/stdout.log";
-       my %opts = (
-               LocalAddr => '127.0.0.1',
-               ReuseAddr => 1,
-               Proto => 'tcp',
-               Type => SOCK_STREAM,
-               Listen => 1024,
-       );
+       my $err = "$inboxdir/stderr.log";
+       my $out = "$inboxdir/stdout.log";
        my $group = 'inbox.comp.test.v2writable';
-       my $pi_config = "$mainrepo/pi_config";
+       my $pi_config = "$inboxdir/pi_config";
        open my $fh, '>', $pi_config or die "open: $!\n";
        print $fh <<EOF
 [publicinbox "test-v2writable"]
-       mainrepo = $mainrepo
+       inboxdir = $inboxdir
        version = 2
        address = test\@example.com
        newsgroup = $group
 EOF
        ;
        close $fh or die "close: $!\n";
-       my $sock = IO::Socket::INET->new(%opts);
+       my $sock = tcp_server();
        ok($sock, 'sock created');
        my $pid;
        my $len;
@@ -268,4 +276,16 @@ EOF
        $im->done;
 }
 
+my $tmp = {
+       inboxdir => "$inboxdir/non-existent/subdir",
+       name => 'nope',
+       version => 2,
+       -primary_address => 'test@example.com',
+};
+eval {
+       my $nope = PublicInbox::V2Writable->new($tmp);
+       $nope->add($mime);
+};
+ok($@, 'V2Writable fails on non-existent dir');
+
 done_testing();