t/v2writable: use simplify permissions reading

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

diff --git a/t/v2writable.t b/t/v2writable.t
index bbe6d14b7fecf3e7720f3e37fe1835c65430fc87..7abb14f63b10b56f6b7e4e44b1088951322e7882 100644 (file)
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -43,13 +43,9 @@ if ('ensure git configs are correct') {
                qw(core.sharedRepository 0644));
        is(system(@cmd), 0, "set sharedRepository in all.git");
        $git0 = PublicInbox::Git->new("$mainrepo/git/0.git");
-       my $fh = $git0->popen(qw(config core.sharedRepository));
-       my $v = eval { local $/; <$fh> };
-       chomp $v;
+       chomp(my $v = $git0->qx(qw(config core.sharedRepository)));
        is($v, '0644', 'child repo inherited core.sharedRepository');
-       $fh = $git0->popen(qw(config --bool repack.writeBitmaps));
-       $v = eval { local $/; <$fh> };
-       chomp $v;
+       chomp($v = $git0->qx(qw(config --bool repack.writeBitmaps)));
        is($v, 'true', 'child repo inherited repack.writeBitmaps');
 }
 
@@ -57,15 +53,19 @@ if ('ensure git configs are correct') {
        my @warn;
        local $SIG{__WARN__} = sub { push @warn, @_ };
        is($im->add($mime), undef, 'obvious duplicate rejected');
-       like(join(' ', @warn), qr/resent/, 'warned about resent message');
+       is(scalar(@warn), 0, 'no warning about resent message');
 
        @warn = ();
        $mime->header_set('Message-Id', '<a-mid@b>', '<c@d>');
-       ok($im->add($mime), 'secondary MID used');
+       is($im->add($mime), undef, 'secondary MID ignored if first matches');
+       my $sec = PublicInbox::MIME->new($mime->as_string);
+       $sec->header_set('Date');
+       $sec->header_set('Message-Id', '<a-mid@b>', '<c@d>');
+       ok($im->add($sec), 'secondary MID used if data is different');
        like(join(' ', @warn), qr/mismatched/, 'warned about mismatch');
        like(join(' ', @warn), qr/alternative/, 'warned about alternative');
        is_deeply([ '<a-mid@b>', '<c@d>' ],
-               [ $mime->header_obj->header_raw('Message-Id') ],
+               [ $sec->header_obj->header_raw('Message-Id') ],
                'no new Message-Id added');
 
        my $sane_mid = qr/\A<[\w\-]+\@localhost>\z/;
@@ -75,8 +75,8 @@ if ('ensure git configs are correct') {
        ok($im->add($mime), 'reused mid ok');
        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], $sane_mid, 'new MID added');
+       is($mids[0], '<a-mid@b>', 'original mid not changed');
+       like($mids[1], $sane_mid, 'new MID added');
        is(scalar(@mids), 2, 'only one new MID added');
 
        @warn = ();
@@ -85,14 +85,14 @@ if ('ensure git configs are correct') {
        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);
+       $fake->header_set('Message-Id', "<$gen>");
        ok($im->add($fake), 'fake added easily');
        is_deeply(\@warn, [], 'no warnings from a faker');
        ok($im->add($mime), 'random MID made');
        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], $sane_mid, 'new MID added');
+       is($mids[0], '<a-mid@b>', 'original mid not changed');
+       like($mids[1], $sane_mid, 'new MID added');
        is(scalar(@mids), 2, 'only one new MID added');
 
        @warn = ();
@@ -108,10 +108,10 @@ 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 });
+       my $srch = $ibx->search;
+       $srch->reopen->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 });
+       $srch->reopen->each_smsg_by_mid('abcde@2', sub { push @found, @_; 1 });
        is(scalar(@found), 2, 'message found by second MID');
        is($found[0]->{doc_id}, $found[1]->{doc_id}, 'same document');
        ok($found[1]->{doc_id} > 0, 'doc_id is positive');
@@ -218,6 +218,20 @@ EOF
        } else {
                fail('failed to extract blob from log output');
        }
+       is($im->remove($mime, 'test removal'), undef,
+               'remove is idempotent');
+       $im->done;
+       is($git0->qx(qw(log -1 --pretty=raw --raw -r --no-abbrev)),
+               $after, 'no git history made with idempotent remove');
+       eval { $im->done };
+       ok(!$@, '->done is idempotent');
+}
+
+{
+       ok($im->add($mime), 'add message to be purged');
+       local $SIG{__WARN__} = sub {};
+       ok($im->purge($mime), 'purged message');
+       $im->done;
 }
 
 done_testing();