X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fv2writable.t;h=7e7560b39b19446378c83baa9142809458e2d877;hb=62d1a4da996bd9a664be954f71f78fe052f9df16;hp=8bbcd45aad808e3701953bf7e5e7057173cd7185;hpb=fda0f1721b2dc1d2852388473f7da50ff230a3b6;p=public-inbox.git
diff --git a/t/v2writable.t b/t/v2writable.t
index 8bbcd45a..7e7560b3 100644
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -1,17 +1,14 @@
-# Copyright (C) 2018-2019 all contributors
+# Copyright (C) 2018-2020 all contributors
# License: AGPL-3.0+
use strict;
use warnings;
use Test::More;
use PublicInbox::MIME;
-use PublicInbox::ContentId qw(content_digest);
-require './t/common.perl';
+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 Email::MIME));
local $ENV{HOME} = abs_path('t');
use_ok 'PublicInbox::V2Writable';
umask 007;
@@ -23,7 +20,7 @@ my $ibx = {
-primary_address => 'test@example.com',
};
$ibx = PublicInbox::Inbox->new($ibx);
-my $mime = PublicInbox::MIME->create(
+my $mime = Email::MIME->create(
header => [
From => 'a@example.com',
To => 'test@example.com',
@@ -51,7 +48,7 @@ my $git0;
if ('ensure git configs are correct') {
my @cmd = (qw(git config), "--file=$inboxdir/all.git/config",
qw(core.sharedRepository 0644));
- is(system(@cmd), 0, "set sharedRepository in all.git");
+ is(xsys(@cmd), 0, "set sharedRepository in all.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');
@@ -112,6 +109,11 @@ if ('ensure git configs are correct') {
@mids = $mime->header_obj->header_raw('Message-Id');
like($mids[0], $sane_mid, 'mid was generated');
is(scalar(@mids), 1, 'new generated');
+
+ @warn = ();
+ $mime->header_set('Message-Id', '');
+ ok($im->add($mime), 'message added with space in Message-Id');
+ is_deeply([], \@warn);
}
{
@@ -178,8 +180,13 @@ EOF
is($uniq{$mid}++, 0, "MID for $num is unique in XOVER");
is_deeply($n->xhdr('Message-ID', $num),
{ $num => $mid }, "XHDR lookup OK on num $num");
+
+ # FIXME PublicInbox::NNTP (server) doesn't handle spaces in
+ # Message-ID, but neither does Net::NNTP (client)
+ next if $mid =~ / /;
+
is_deeply($n->xhdr('Message-ID', $mid),
- { $mid => $mid }, "XHDR lookup OK on MID $num");
+ { $mid => $mid }, "XHDR lookup OK on MID $mid ($num)");
}
my %nn;
foreach my $mid (@{$n->newnews(0, $group)}) {
@@ -209,7 +216,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 +297,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();