X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fv2reindex.t;h=9bc271fc2d35312b4a1eae20fae24112afb92fb4;hb=4db4bfa2c9178b315d2ac09cff794a4476ba1f6e;hp=b9540e4abce4e3087549da720077d68644ef68b4;hpb=4c5fa84eec85cf406cbcd900f92dc478ed14ea30;p=public-inbox.git diff --git a/t/v2reindex.t b/t/v2reindex.t index b9540e4a..9bc271fc 100644 --- a/t/v2reindex.t +++ b/t/v2reindex.t @@ -30,9 +30,8 @@ my $mime = PublicInbox::MIME->create( ], body => "hello world\n", ); - +local $ENV{NPROC} = 2; my $im = PublicInbox::V2Writable->new($ibx, 1); -$im->{parallel} = 0; foreach my $i (1..10) { $mime->header_set('Message-Id', "<$i\@example.com>"); ok($im->add($mime), "message $i added"); @@ -50,14 +49,14 @@ $im->done; my $minmax = [ $ibx->mm->minmax ]; ok(defined $minmax->[0] && defined $minmax->[1], 'minmax defined'); -eval { $im->reindex }; +eval { $im->index_sync({reindex => 1}) }; is($@, '', 'no error from reindexing'); $im->done; my $xap = "$mainrepo/xap".PublicInbox::Search::SCHEMA_VERSION(); remove_tree($xap); ok(!-d $xap, 'Xapian directories removed'); -eval { $im->reindex }; +eval { $im->index_sync({reindex => 1}) }; is($@, '', 'no error from reindexing'); $im->done; ok(-d $xap, 'Xapian directories recreated'); @@ -71,9 +70,9 @@ ok(!-d $xap, 'Xapian directories removed again'); { my @warn; local $SIG{__WARN__} = sub { push @warn, @_ }; - eval { $im->reindex }; + eval { $im->index_sync({reindex => 1}) }; is($@, '', 'no error from reindexing without msgmap'); - like(join(' ', @warn), qr/regenerat/, 'warned about regenerating'); + is(scalar(@warn), 0, 'no warnings from reindexing'); $im->done; ok(-d $xap, 'Xapian directories recreated'); delete $ibx->{mm}; @@ -86,7 +85,7 @@ ok(!-d $xap, 'Xapian directories removed again'); { my @warn; local $SIG{__WARN__} = sub { push @warn, @_ }; - eval { $im->reindex(my $regen = 1) }; + eval { $im->index_sync({reindex => 1}) }; is($@, '', 'no error from reindexing without msgmap'); is_deeply(\@warn, [], 'no warnings'); $im->done;