import: switch to URL-safe Base64 for Message-IDs

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

diff --git a/t/v2writable.t b/t/v2writable.t
index 2d35aca387d524b145e2fe58844e4a8391778d3d..bbe6d14b7fecf3e7720f3e37fe1835c65430fc87 100644 (file)
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -30,14 +30,19 @@ my $mime = PublicInbox::MIME->create(
        body => "hello world\n",
 );
 
-my $im = PublicInbox::V2Writable->new($ibx, 1);
+my $im = eval {
+       local $ENV{NPROC} = '1';
+       PublicInbox::V2Writable->new($ibx, 1);
+};
+is($im->{partitions}, 1, 'one partition when forced');
 ok($im->add($mime), 'ordinary message added');
+my $git0;
 
 if ('ensure git configs are correct') {
        my @cmd = (qw(git config), "--file=$mainrepo/all.git/config",
                qw(core.sharedRepository 0644));
        is(system(@cmd), 0, "set sharedRepository in all.git");
-       my $git0 = PublicInbox::Git->new("$mainrepo/git/0.git");
+       $git0 = PublicInbox::Git->new("$mainrepo/git/0.git");
        my $fh = $git0->popen(qw(config core.sharedRepository));
        my $v = eval { local $/; <$fh> };
        chomp $v;
@@ -51,7 +56,7 @@ if ('ensure git configs are correct') {
 {
        my @warn;
        local $SIG{__WARN__} = sub { push @warn, @_ };
-       is(undef, $im->add($mime), 'obvious duplicate rejected');
+       is($im->add($mime), undef, 'obvious duplicate rejected');
        like(join(' ', @warn), qr/resent/, 'warned about resent message');
 
        @warn = ();
@@ -63,6 +68,7 @@ if ('ensure git configs are correct') {
                [ $mime->header_obj->header_raw('Message-Id') ],
                'no new Message-Id added');
 
+       my $sane_mid = qr/\A<[\w\-]+\@localhost>\z/;
        @warn = ();
        $mime->header_set('Message-Id', '<a-mid@b>');
        $mime->body_set('different');
@@ -70,13 +76,14 @@ if ('ensure git configs are correct') {
        like(join(' ', @warn), qr/reused/, 'warned about reused MID');
        my @mids = $mime->header_obj->header_raw('Message-Id');
        is($mids[1], '<a-mid@b>', 'original mid not changed');
-       like($mids[0], qr/\A<\w+\@localhost>\z/, 'new MID added');
+       like($mids[0], $sane_mid, 'new MID added');
        is(scalar(@mids), 2, 'only one new MID added');
 
        @warn = ();
        $mime->header_set('Message-Id', '<a-mid@b>');
        $mime->body_set('this one needs a random mid');
-       my $gen = content_digest($mime)->hexdigest . '@localhost';
+       my $gen = PublicInbox::Import::digest2mid(content_digest($mime));
+       unlike($gen, qr![\+/=]!, 'no URL-unfriendly chars in Message-Id');
        my $fake = PublicInbox::MIME->new($mime->as_string);
        $fake->header_set('Message-Id', $gen);
        ok($im->add($fake), 'fake added easily');
@@ -85,14 +92,14 @@ if ('ensure git configs are correct') {
        like(join(' ', @warn), qr/using random/, 'warned about using random');
        @mids = $mime->header_obj->header_raw('Message-Id');
        is($mids[1], '<a-mid@b>', 'original mid not changed');
-       like($mids[0], qr/\A<\w+\@localhost>\z/, 'new MID added');
+       like($mids[0], $sane_mid, 'new MID added');
        is(scalar(@mids), 2, 'only one new MID added');
 
        @warn = ();
        $mime->header_set('Message-Id');
        ok($im->add($mime), 'random MID made for MID free message');
        @mids = $mime->header_obj->header_raw('Message-Id');
-       like($mids[0], qr/\A<\w+\@localhost>\z/, 'mid was generated');
+       like($mids[0], $sane_mid, 'mid was generated');
        is(scalar(@mids), 1, 'new generated');
 }
 
@@ -101,6 +108,7 @@ if ('ensure git configs are correct') {
        ok($im->add($mime), 'message with multiple Message-ID');
        $im->done;
        my @found;
+       $ibx->search->reopen;
        $ibx->search->each_smsg_by_mid('abcde@1', sub { push @found, @_; 1 });
        is(scalar(@found), 1, 'message found by first MID');
        $ibx->search->each_smsg_by_mid('abcde@2', sub { push @found, @_; 1 });
@@ -182,5 +190,34 @@ EOF
        }
        is_deeply([sort keys %nn], [sort keys %uniq]);
 };
+{
+       local $ENV{NPROC} = 2;
+       my @before = $git0->qx(qw(log --pretty=oneline));
+       my $before = $git0->qx(qw(log --pretty=raw --raw -r --no-abbrev));
+       $im = PublicInbox::V2Writable->new($ibx, 1);
+       is($im->{partitions}, 1, 'detected single partition from previous');
+       my $smsg = $im->remove($mime, 'test removal');
+       my @after = $git0->qx(qw(log --pretty=oneline));
+       $im->done;
+       my $tip = shift @after;
+       like($tip, qr/\A[a-f0-9]+ test removal\n\z/s,
+               'commit message propaged to git');
+       is_deeply(\@after, \@before, 'only one commit written to git');
+       is($ibx->mm->num_for($smsg->mid), undef, 'no longer in Msgmap by mid');
+       like($smsg->num, qr/\A\d+\z/, 'numeric number in return message');
+       is($ibx->mm->mid_for($smsg->num), undef, 'no longer in Msgmap by num');
+       my $srch = $ibx->search->reopen;
+       my @found = ();
+       $srch->each_smsg_by_mid($smsg->mid, sub { push @found, @_; 1 });
+       is(scalar(@found), 0, 'no longer found in Xapian skeleton');
+
+       my $after = $git0->qx(qw(log -1 --pretty=raw --raw -r --no-abbrev));
+       if ($after =~ m!( [a-f0-9]+ )A\t_/D$!) {
+               my $oid = $1;
+               ok(index($before, $oid) > 0, 'no new blob introduced');
+       } else {
+               fail('failed to extract blob from log output');
+       }
+}
 
 done_testing();