X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fv2writable.t;h=2bd7a40097811ea5f79a938f581461e56a46dc1c;hb=62b80b61d334361677e26e9ddb966e6bc5f8635d;hp=7519b4878585746851526cd998d0828106d91168;hpb=ad6f26f3b9f0e428020d05667987556f8fcbec2f;p=public-inbox.git diff --git a/t/v2writable.t b/t/v2writable.t index 7519b487..2bd7a400 100644 --- a/t/v2writable.t +++ b/t/v2writable.t @@ -1,16 +1,15 @@ -# 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::Eml; +use PublicInbox::ContentHash qw(content_digest content_hash); +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, $for_destroy) = tmpdir(); @@ -21,17 +20,15 @@ my $ibx = { -primary_address => 'test@example.com', }; $ibx = PublicInbox::Inbox->new($ibx); -my $mime = PublicInbox::MIME->create( - header => [ - From => 'a@example.com', - To => 'test@example.com', - Subject => 'this is a subject', - 'Message-ID' => '', - Date => 'Fri, 02 Oct 1993 00:00:00 +0000', - ], - body => "hello world\n", -); +my $mime = PublicInbox::Eml->new(<<'EOF'); +From: a@example.com +To: test@example.com +Subject: this is a subject +Message-ID: +Date: Fri, 02 Oct 1993 00:00:00 +0000 +hello world +EOF my $im = PublicInbox::V2Writable->new($ibx, {nproc => 1}); is($im->{shards}, 1, 'one shard when forced'); ok($im->add($mime), 'ordinary message added'); @@ -49,7 +46,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'); @@ -66,7 +63,7 @@ if ('ensure git configs are correct') { @warn = (); $mime->header_set('Message-Id', '', ''); is($im->add($mime), undef, 'secondary MID ignored if first matches'); - my $sec = PublicInbox::MIME->new($mime->as_string); + my $sec = PublicInbox::Eml->new($mime->as_string); $sec->header_set('Date'); $sec->header_set('Message-Id', '', ''); ok($im->add($sec), 'secondary MID used if data is different'); @@ -93,7 +90,7 @@ if ('ensure git configs are correct') { my $hdr = $mime->header_obj; my $gen = PublicInbox::Import::digest2mid(content_digest($mime), $hdr); unlike($gen, qr![\+/=]!, 'no URL-unfriendly chars in Message-Id'); - my $fake = PublicInbox::MIME->new($mime->as_string); + my $fake = PublicInbox::Eml->new($mime->as_string); $fake->header_set('Message-Id', "<$gen>"); ok($im->add($fake), 'fake added easily'); is_deeply(\@warn, [], 'no warnings from a faker'); @@ -110,6 +107,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); } { @@ -176,8 +178,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)}) { @@ -207,19 +214,23 @@ 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_hash($rm_mime), content_hash($mime), + 'removed object returned matches'); + ok(defined($mark), 'mark set'); $im->done; my @after = $git0->qx(@log, qw(--pretty=oneline)); my $tip = shift @after; like($tip, qr/\A[a-f0-9]+ test removal\n\z/s, 'commit message propagated 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'); + my $mid = $smsg->{mid}; + is($ibx->mm->num_for($mid), undef, 'no longer in Msgmap by mid'); my $num = $smsg->{num}; like($num, qr/\A\d+\z/, 'numeric number in return message'); is($ibx->mm->mid_for($num), undef, 'no longer in Msgmap by num'); my $srch = $ibx->search->reopen; - my $mset = $srch->query('m:'.$smsg->mid, { mset => 1}); + my $mset = $srch->query('m:'.$mid, { mset => 1}); is($mset->size, 0, 'no longer found in Xapian'); my @log1 = (@log, qw(-1 --pretty=raw --raw -r --no-renames)); is($srch->{over_ro}->get_art($num), undef, @@ -285,4 +296,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();