From 61d33536cdda6a9e6267161b25e7f8701501b34c Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Wed, 1 Aug 2018 11:43:33 -0500 Subject: t/v1reindex.t: Isolate the test cases While inspecting the tests I realized that because we have been reusing variables there can be a memory between one test case and another. Add scopes and local variables to prevent an unintended memory between one test and another. Signed-off-by: "Eric W. Biederman" --- t/v1reindex.t | 111 ++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 66 insertions(+), 45 deletions(-) diff --git a/t/v1reindex.t b/t/v1reindex.t index 75380f0f..fdffdaee 100644 --- a/t/v1reindex.t +++ b/t/v1reindex.t @@ -22,7 +22,6 @@ my $ibx_config = { -primary_address => 'test@example.com', indexlevel => 'full', }; -my $ibx = PublicInbox::Inbox->new($ibx_config); my $mime = PublicInbox::MIME->create( header => [ From => 'a@example.com', @@ -32,55 +31,72 @@ my $mime = PublicInbox::MIME->create( ], body => "hello world\n", ); -my $im = PublicInbox::Import->new($ibx->git, undef, undef, $ibx); -foreach my $i (1..10) { - $mime->header_set('Message-Id', "<$i\@example.com>"); - ok($im->add($mime), "message $i added"); - if ($i == 4) { - $im->remove($mime); +my $minmax; +{ + my %config = %$ibx_config; + my $ibx = PublicInbox::Inbox->new(\%config); + my $im = PublicInbox::Import->new($ibx->git, undef, undef, $ibx); + foreach my $i (1..10) { + $mime->header_set('Message-Id', "<$i\@example.com>"); + ok($im->add($mime), "message $i added"); + if ($i == 4) { + $im->remove($mime); + } } -} -if ('test remove later') { - $mime->header_set('Message-Id', "<5\@example.com>"); - $im->remove($mime); -} + if ('test remove later') { + $mime->header_set('Message-Id', "<5\@example.com>"); + $im->remove($mime); + } -$im->done; -my $rw = PublicInbox::SearchIdx->new($ibx, 1); -eval { $rw->index_sync() }; -is($@, '', 'no error from indexing'); + $im->done; + my $rw = PublicInbox::SearchIdx->new($ibx, 1); + eval { $rw->index_sync() }; + is($@, '', 'no error from indexing'); -my $minmax = [ $ibx->mm->minmax ]; -ok(defined $minmax->[0] && defined $minmax->[1], 'minmax defined'); -is_deeply($minmax, [ 1, 10 ], 'minmax as expected'); + $minmax = [ $ibx->mm->minmax ]; + ok(defined $minmax->[0] && defined $minmax->[1], 'minmax defined'); + is_deeply($minmax, [ 1, 10 ], 'minmax as expected'); +} -$rw = PublicInbox::SearchIdx->new($ibx, 1); -eval { $rw->index_sync({reindex => 1}) }; -is($@, '', 'no error from reindexing'); -$im->done; +{ + my %config = %$ibx_config; + my $ibx = PublicInbox::Inbox->new(\%config); + my $im = PublicInbox::Import->new($ibx->git, undef, undef, $ibx); + my $rw = PublicInbox::SearchIdx->new($ibx, 1); + eval { $rw->index_sync({reindex => 1}) }; + is($@, '', 'no error from reindexing'); + $im->done; +} my $xap = "$mainrepo/public-inbox/xapian".PublicInbox::Search::SCHEMA_VERSION(); remove_tree($xap); ok(!-d $xap, 'Xapian directories removed'); -$rw = PublicInbox::SearchIdx->new($ibx, 1); +{ + my %config = %$ibx_config; + my $ibx = PublicInbox::Inbox->new(\%config); + my $im = PublicInbox::Import->new($ibx->git, undef, undef, $ibx); + my $rw = PublicInbox::SearchIdx->new($ibx, 1); -eval { $rw->index_sync({reindex => 1}) }; -is($@, '', 'no error from reindexing'); -$im->done; -ok(-d $xap, 'Xapian directories recreated'); + eval { $rw->index_sync({reindex => 1}) }; + is($@, '', 'no error from reindexing'); + $im->done; + ok(-d $xap, 'Xapian directories recreated'); -delete $ibx->{mm}; -is_deeply([ $ibx->mm->minmax ], $minmax, 'minmax unchanged'); + delete $ibx->{mm}; + is_deeply([ $ibx->mm->minmax ], $minmax, 'minmax unchanged'); +} ok(unlink "$mainrepo/public-inbox/msgmap.sqlite3", 'remove msgmap'); remove_tree($xap); ok(!-d $xap, 'Xapian directories removed again'); - -$rw = PublicInbox::SearchIdx->new($ibx, 1); { my @warn; local $SIG{__WARN__} = sub { push @warn, @_ }; + my %config = %$ibx_config; + my $ibx = PublicInbox::Inbox->new(\%config); + my $im = PublicInbox::Import->new($ibx->git, undef, undef, $ibx); + my $rw = PublicInbox::SearchIdx->new($ibx, 1); eval { $rw->index_sync({reindex => 1}) }; is($@, '', 'no error from reindexing without msgmap'); is(scalar(@warn), 0, 'no warnings from reindexing'); @@ -93,11 +109,13 @@ $rw = PublicInbox::SearchIdx->new($ibx, 1); ok(unlink "$mainrepo/public-inbox/msgmap.sqlite3", 'remove msgmap'); remove_tree($xap); ok(!-d $xap, 'Xapian directories removed again'); - -$rw = PublicInbox::SearchIdx->new($ibx, 1); { my @warn; local $SIG{__WARN__} = sub { push @warn, @_ }; + my %config = %$ibx_config; + my $ibx = PublicInbox::Inbox->new(\%config); + my $im = PublicInbox::Import->new($ibx->git, undef, undef, $ibx); + my $rw = PublicInbox::SearchIdx->new($ibx, 1); eval { $rw->index_sync({reindex => 1}) }; is($@, '', 'no error from reindexing without msgmap'); is_deeply(\@warn, [], 'no warnings'); @@ -110,13 +128,14 @@ $rw = PublicInbox::SearchIdx->new($ibx, 1); ok(unlink "$mainrepo/public-inbox/msgmap.sqlite3", 'remove msgmap'); remove_tree($xap); ok(!-d $xap, 'Xapian directories removed again'); - -$ibx_config->{indexlevel} = 'medium'; -$ibx = PublicInbox::Inbox->new($ibx_config); -$rw = PublicInbox::SearchIdx->new($ibx, 1); { my @warn; local $SIG{__WARN__} = sub { push @warn, @_ }; + my %config = %$ibx_config; + $config{indexlevel} = 'medium'; + my $ibx = PublicInbox::Inbox->new(\%config); + my $im = PublicInbox::Import->new($ibx->git, undef, undef, $ibx); + my $rw = PublicInbox::SearchIdx->new($ibx, 1); eval { $rw->index_sync({reindex => 1}) }; is($@, '', 'no error from reindexing without msgmap'); is_deeply(\@warn, [], 'no warnings'); @@ -131,13 +150,14 @@ $rw = PublicInbox::SearchIdx->new($ibx, 1); ok(unlink "$mainrepo/public-inbox/msgmap.sqlite3", 'remove msgmap'); remove_tree($xap); ok(!-d $xap, 'Xapian directories removed again'); - -$ibx_config->{indexlevel} = 'basic'; -$ibx = PublicInbox::Inbox->new($ibx_config); -$rw = PublicInbox::SearchIdx->new($ibx, 1); { my @warn; local $SIG{__WARN__} = sub { push @warn, @_ }; + my %config = %$ibx_config; + $config{indexlevel} = 'basic'; + my $ibx = PublicInbox::Inbox->new(\%config); + my $im = PublicInbox::Import->new($ibx->git, undef, undef, $ibx); + my $rw = PublicInbox::SearchIdx->new($ibx, 1); eval { $rw->index_sync({reindex => 1}) }; is($@, '', 'no error from reindexing without msgmap'); is_deeply(\@warn, [], 'no warnings'); @@ -152,13 +172,14 @@ $rw = PublicInbox::SearchIdx->new($ibx, 1); # upgrade existing basic to medium # note: changing indexlevels is not yet supported in v2, # and may not be without more effort -$ibx_config->{indexlevel} = 'medium'; -$ibx = PublicInbox::Inbox->new($ibx_config); -$rw = PublicInbox::SearchIdx->new($ibx, 1); # no removals { my @warn; local $SIG{__WARN__} = sub { push @warn, @_ }; + my %config = %$ibx_config; + $config{indexleve} = 'medium'; + my $ibx = PublicInbox::Inbox->new(\%config); + my $rw = PublicInbox::SearchIdx->new($ibx, 1); eval { $rw->index_sync }; is($@, '', 'no error from indexing'); is_deeply(\@warn, [], 'no warnings'); -- cgit v1.2.3-24-ge0c7