v2writable: newest epochs go first in alternates

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

diff --git a/t/v2writable.t b/t/v2writable.t
index c2daac2f8484b4feb72ea752948af6cf9ac2cd2f..7ceaa6e4c9cbda90a5787aff56445157bba1b95b 100644 (file)
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -5,16 +5,14 @@ use warnings;
 use Test::More;
 use PublicInbox::MIME;
 use PublicInbox::ContentId qw(content_digest);
-use File::Temp qw/tempdir/;
-require './t/common.perl';
+use PublicInbox::TestCommon;
+use Cwd qw(abs_path);
 require_git(2.6);
-foreach my $mod (qw(DBD::SQLite Search::Xapian)) {
-       eval "require $mod";
-       plan skip_all => "$mod missing for nntpd.t" if $@;
-}
+require_mods(qw(DBD::SQLite Search::Xapian));
+local $ENV{HOME} = abs_path('t');
 use_ok 'PublicInbox::V2Writable';
 umask 007;
-my $inboxdir = tempdir('pi-v2writable-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($inboxdir, $for_destroy) = tmpdir();
 my $ibx = {
        inboxdir => $inboxdir,
        name => 'test-v2writable',
@@ -115,6 +113,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,6 +126,21 @@ 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');
 }
 
 {
@@ -147,12 +161,10 @@ EOF
        close $fh or die "close: $!\n";
        my $sock = tcp_server();
        ok($sock, 'sock created');
-       my $pid;
        my $len;
-       END { kill 'TERM', $pid if defined $pid };
-       my $nntpd = 'blib/script/public-inbox-nntpd';
-       my $cmd = [ $nntpd, "--stdout=$out", "--stderr=$err" ];
-       $pid = spawn_listener({ PI_CONFIG => $pi_config }, $cmd, [ $sock ]);
+       my $cmd = [ '-nntpd', '-W0', "--stdout=$out", "--stderr=$err" ];
+       my $env = { PI_CONFIG => $pi_config };
+       my $td = start_script($cmd, $env, { 3 => $sock });
        my $host_port = $sock->sockhost . ':' . $sock->sockport;
        my $n = Net::NNTP->new($host_port);
        $n->group($group);
@@ -260,4 +272,40 @@ 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');
+
+{
+       my $v2w = PublicInbox::V2Writable->new($tmp, 1);
+       ok($v2w, 'creat flag works');
+       $v2w->{parallel} = 0;
+       $v2w->init_inbox(0);
+       my $alt = "$tmp->{inboxdir}/all.git/objects/info/alternates";
+       open my $fh, '>>', $alt or die $!;
+       print $fh "$inboxdir/all.git/objects\n" or die $!;
+       chmod(0664, $fh) or die "fchmod: $!";
+       close $fh or die $!;
+       open $fh, '<', $alt or die $!;
+       my $before = do { local $/; <$fh> };
+
+       ok($v2w->git_init(3), 'init a new epoch');
+       open $fh, '<', $alt or die $!;
+       my $after = do { local $/; <$fh> };
+       ok(index($after, $before) > 0,
+               'old contents preserved after adding epoch');
+       like($after, qr!\A[^\n]+?/3\.git/objects\n!s,
+               'first line is newest epoch');
+       my $mode = (stat($alt))[2] & 07777;
+       is($mode, 0664, sprintf('0%03o', $mode).' is 0664');
+}
+
 done_testing();