v2writable: make remove return-compatible w/ Import::remove

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

diff --git a/t/v2writable.t b/t/v2writable.t
index bf2064d0055905525f1645cca4c832bbe94b5630..cdcfe4d0680029a1d1bb329ff5c0a81cc8316a56 100644 (file)
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -1,17 +1,14 @@
-# Copyright (C) 2018-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2018-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
 use Test::More;
 use PublicInbox::MIME;
-use PublicInbox::ContentId qw(content_digest);
+use PublicInbox::ContentId qw(content_digest content_id);
 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;
@@ -209,7 +206,10 @@ EOF
        my $before = $git0->qx(@log, qw(--pretty=raw --raw -r));
        $im = PublicInbox::V2Writable->new($ibx, {nproc => 2});
        is($im->{shards}, 1, 'detected single shard from previous');
-       my $smsg = $im->remove($mime, 'test removal');
+       my ($mark, $rm_mime, $smsg) = $im->remove($mime, 'test removal');
+       is(content_id($rm_mime), content_id($mime),
+                       'removed object returned matches');
+       ok(defined($mark), 'mark set');
        $im->done;
        my @after = $git0->qx(@log, qw(--pretty=oneline));
        my $tip = shift @after;
@@ -287,4 +287,28 @@ eval {
 };
 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();