X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fmulti-mid.t;h=41d556b9ceb993ebb9276d01149ca2f8c5e65c55;hb=de9648ca847cf032aab6da9cac1217bf9cca9c90;hp=0d283a0d08a9188762c3b3d6b7ee9e4cc9d83e58;hpb=2b359355ae5839a5597ba81a40194bb3503118a0;p=public-inbox.git diff --git a/t/multi-mid.t b/t/multi-mid.t index 0d283a0d..41d556b9 100644 --- a/t/multi-mid.t +++ b/t/multi-mid.t @@ -1,27 +1,27 @@ # Copyright (C) 2020 all contributors # License: AGPL-3.0+ +use strict; use Test::More; -use PublicInbox::MIME; +use PublicInbox::Eml; use PublicInbox::TestCommon; use PublicInbox::InboxWritable; -use PublicInbox::SearchIdx; require_git(2.6); require_mods(qw(DBD::SQLite)); +require PublicInbox::SearchIdx; +my $delay = $ENV{TEST_DELAY_CONVERT}; my $addr = 'test@example.com'; -my $bad = PublicInbox::MIME->new(<new(< Message-ID: From: a\@example.com To: $addr -Date: Fri, 02 Oct 1993 00:00:00 +0000 Subject: bad EOF -my $good = PublicInbox::MIME->new(<new(< -Date: Fri, 02 Oct 1993 00:00:00 +0000 From: b\@example.com To: $addr Subject: good @@ -37,25 +37,46 @@ for my $order ([$bad, $good], [$good, $bad]) { indexlevel => 'basic', -primary_address => $addr, }, my $creat_opt = {}); + my @old; if ('setup v1 inbox') { my $im = $ibx->importer(0); - ok($im->add($_), 'added '.$_->header('Subject')) for @$order; + for (@$order) { + ok($im->add($_), 'added '.$_->header('Subject')); + sleep($delay) if $delay; + } $im->done; my $s = PublicInbox::SearchIdx->new($ibx, 1); $s->index_sync; $before = [ $ibx->mm->minmax ]; + @old = ($ibx->over->get_art(1), $ibx->over->get_art(2)); $ibx->cleanup; } my $rdr = { 1 => \(my $out = ''), 2 => \(my $err = '') }; my $cmd = [ '-convert', $ibx->{inboxdir}, "$tmpdir/v2" ]; - ok(run_script($cmd, undef, $rdr), - 'convert to v2'); + my $env = { PI_DIR => "$tmpdir/.public-inbox" }; + ok(run_script($cmd, $env, $rdr), 'convert to v2'); $err =~ s!\AW: $tmpdir/v1 not configured[^\n]+\n!!s; is($err, '', 'no errors or warnings from -convert'); $ibx->{version} = 2; $ibx->{inboxdir} = "$tmpdir/v2"; is_deeply([$ibx->mm->minmax], $before, 'min, max article numbers unchanged'); + + my @v2 = ($ibx->over->get_art(1), $ibx->over->get_art(2)); + is_deeply(\@v2, \@old, 'v2 conversion times match'); + + xsys(qw(git clone -sq --mirror), "$tmpdir/v2/git/0.git", + "$tmpdir/v2-clone/git/0.git") == 0 or die "clone: $?"; + $cmd = [ '-init', '-Lbasic', '-V2', 'v2c', "$tmpdir/v2-clone", + 'http://example.com/v2c', 'v2c@example.com' ]; + ok(run_script($cmd, $env), 'init clone'); + $cmd = [ qw(-index -j0), "$tmpdir/v2-clone" ]; + sleep($delay) if $delay; + ok(run_script($cmd, $env), 'index the clone'); + $ibx->cleanup; + $ibx->{inboxdir} = "$tmpdir/v2-clone"; + my @v2c = ($ibx->over->get_art(1), $ibx->over->get_art(2)); + is_deeply(\@v2c, \@old, 'v2 clone times match'); } done_testing();