X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fconvert-compact.t;h=1627e0195b5219cd73008cb5e5e87f678db25078;hb=ff53e6728ff67fef548f0f472c1918a00d7104f7;hp=922ec9c2daa7f0d8f43cf6925169ff37d82740f9;hpb=e5c2e2588d7ad2243afeabad67b3c951c5b66643;p=public-inbox.git diff --git a/t/convert-compact.t b/t/convert-compact.t index 922ec9c2..1627e019 100644 --- a/t/convert-compact.t +++ b/t/convert-compact.t @@ -1,57 +1,129 @@ -# Copyright (C) 2018 all contributors +# Copyright (C) 2018-2020 all contributors # License: AGPL-3.0+ use strict; use warnings; use Test::More; -use File::Temp qw/tempdir/; use PublicInbox::MIME; -my @mods = qw(DBD::SQLite Search::Xapian); -foreach my $mod (@mods) { - eval "require $mod"; - plan skip_all => "$mod missing for convert-compact.t" if $@; -} -use PublicInbox::V2Writable; +use PublicInbox::Spawn qw(which); +use PublicInbox::TestCommon; +require_git(2.6); +require_mods(qw(DBD::SQLite Search::Xapian)); +which('xapian-compact') or + plan skip_all => 'xapian-compact missing for '.__FILE__; + +use_ok 'PublicInbox::V2Writable'; use PublicInbox::Import; -my $tmpdir = tempdir('convert-compact-XXXXXX', TMPDIR => 1, CLEANUP => 1); +my ($tmpdir, $for_destroy) = tmpdir(); my $ibx = { - mainrepo => "$tmpdir/v1", + inboxdir => "$tmpdir/v1", name => 'test-v1', -primary_address => 'test@example.com', }; -ok(PublicInbox::Import::run_die([qw(git init --bare -q), $ibx->{mainrepo}]), - 'initialized v1 repo'); +PublicInbox::Import::init_bare($ibx->{inboxdir}); +ok(umask(077), 'set restrictive umask'); +ok(PublicInbox::Import::run_die([qw(git) , "--git-dir=$ibx->{inboxdir}", + qw(config core.sharedRepository 0644)]), 'set sharedRepository'); $ibx = PublicInbox::Inbox->new($ibx); my $im = PublicInbox::Import->new($ibx->git, undef, undef, $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::MIME->new(<<'EOF'); +From: a@example.com +To: b@example.com +Subject: this is a subject +Message-ID: +Date: Fri, 02 Oct 1993 00:00:00 +0000 + +hello world +EOF + ok($im->add($mime), 'added one message'); +ok($im->remove($mime), 'remove message'); +ok($im->add($mime), 'added message again'); $im->done; -PublicInbox::SearchIdx->new($ibx, 1)->index_sync; -local $ENV{PATH} = "blib/script:$ENV{PATH}"; -open my $err, '>>', "$tmpdir/err.log" or die "open: err.log $!\n"; -open my $out, '>>', "$tmpdir/out.log" or die "open: out.log $!\n"; -my $rdr = { 1 => fileno($out), 2 => fileno($err) }; +for (1..2) { + eval { PublicInbox::SearchIdx->new($ibx, 1)->index_sync; }; + is($@, '', 'no errors syncing'); +} -my $cmd = [ 'public-inbox-compact', $ibx->{mainrepo} ]; -ok(PublicInbox::Import::run_die($cmd, undef, $rdr), 'v1 compact works'); +is(((stat("$ibx->{inboxdir}/public-inbox"))[2]) & 07777, 0755, + 'sharedRepository respected for v1'); +is(((stat("$ibx->{inboxdir}/public-inbox/msgmap.sqlite3"))[2]) & 07777, 0644, + 'sharedRepository respected for v1 msgmap'); +my @xdir = glob("$ibx->{inboxdir}/public-inbox/xap*/*"); +foreach (@xdir) { + my @st = stat($_); + is($st[2] & 07777, -f _ ? 0644 : 0755, + 'sharedRepository respected on file after convert'); +} + +local $ENV{PI_CONFIG} = '/dev/null'; +my ($out, $err) = ('', ''); +my $rdr = { 1 => \$out, 2 => \$err }; + +my $cmd = [ '-compact', $ibx->{inboxdir} ]; +ok(run_script($cmd, undef, $rdr), 'v1 compact works'); -$cmd = [ 'public-inbox-convert', $ibx->{mainrepo}, "$tmpdir/v2" ]; -ok(PublicInbox::Import::run_die($cmd, undef, $rdr), 'convert works'); +@xdir = glob("$ibx->{inboxdir}/public-inbox/xap*"); +is(scalar(@xdir), 1, 'got one xapian directory after compact'); +is(((stat($xdir[0]))[2]) & 07777, 0755, + 'sharedRepository respected on v1 compact'); + +my $hwm = do { + my $mm = $ibx->mm; + $ibx->cleanup; + $mm->num_highwater; +}; +ok(defined($hwm) && $hwm > 0, "highwater mark set #$hwm"); -$cmd = [ 'public-inbox-compact', "$tmpdir/v2" ]; +$cmd = [ '-convert', '--no-index', $ibx->{inboxdir}, "$tmpdir/no-index" ]; +ok(run_script($cmd, undef, $rdr), 'convert --no-index works'); + +$cmd = [ '-convert', $ibx->{inboxdir}, "$tmpdir/v2" ]; +ok(run_script($cmd, undef, $rdr), 'convert works'); +@xdir = glob("$tmpdir/v2/xap*/*"); +foreach (@xdir) { + my @st = stat($_); + is($st[2] & 07777, -f _ ? 0644 : 0755, + 'sharedRepository respected after convert'); +} + +$cmd = [ '-compact', "$tmpdir/v2" ]; my $env = { NPROC => 2 }; -ok(PublicInbox::Import::run_die($cmd, $env, $rdr), 'v2 compact works'); -$ibx->{mainrepo} = "$tmpdir/v2"; -my $v2w = PublicInbox::V2Writable->new($ibx); -is($v2w->{partitions}, 1, "only one partition in compacted repo"); +ok(run_script($cmd, $env, $rdr), 'v2 compact works'); +$ibx->{inboxdir} = "$tmpdir/v2"; +$ibx->{version} = 2; +is($ibx->mm->num_highwater, $hwm, 'highwater mark unchanged in v2 inbox'); + +@xdir = glob("$tmpdir/v2/xap*/*"); +foreach (@xdir) { + my @st = stat($_); + is($st[2] & 07777, -f _ ? 0644 : 0755, + 'sharedRepository respected after v2 compact'); +} +is(((stat("$tmpdir/v2/msgmap.sqlite3"))[2]) & 07777, 0644, + 'sharedRepository respected for v2 msgmap'); + +@xdir = (glob("$tmpdir/v2/git/*.git/objects/*/*"), + glob("$tmpdir/v2/git/*.git/objects/pack/*")); +foreach (@xdir) { + my @st = stat($_); + is($st[2] & 07777, -f _ ? 0444 : 0755, + 'sharedRepository respected after v2 compact'); +} +my $msgs = $ibx->recent({limit => 1000}); +is($msgs->[0]->{mid}, 'a-mid@b', 'message exists in history'); +is(scalar @$msgs, 1, 'only one message in history'); + +$ibx = undef; +$err = ''; +$cmd = [ qw(-index --reindex -c), "$tmpdir/v2" ]; +ok(run_script($cmd, undef, $rdr), '--reindex -c'); +like($err, qr/xapian-compact/, 'xapian-compact ran (-c)'); + +$rdr->{2} = \(my $err2 = ''); +$cmd = [ qw(-index --reindex -cc), "$tmpdir/v2" ]; +ok(run_script($cmd, undef, $rdr), '--reindex -c -c'); +like($err2, qr/xapian-compact/, 'xapian-compact ran (-c -c)'); +ok(($err2 =~ tr/\n/\n/) > ($err =~ tr/\n/\n/), '-compacted twice'); done_testing();