[PATCH 0/4] minor test cleanups

[PATCH 0/4] minor test cleanups

[Eric W. Biederman]

While developing the ability to disable the indexes I found a few places
where the existing tests could be slightly improved.

Here are my improvements.

Eric W. Biederman (4):
      t/v2reindex.t: Ensure the numbers 1 to 10 are used
      t/search.t t/v2writable.t: Teach search tests to fail more cleanly.
      t/v2reindex.t:  Don't reuse $ibx as two different kinds of variable
      t/v2reindex.t: Swap the order of minmax tests so errors make sense

 t/search.t     | 45 ++++++++++++++++++++++++++-------------------
 t/v2reindex.t  | 11 ++++++-----
 t/v2writable.t |  2 +-
 3 files changed, 33 insertions(+), 25 deletions(-)

Eric

[PATCH 1/4] t/v2reindex.t: Ensure the numbers 1 to 10 are used

[Eric W. Biederman]

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
---
 t/v2reindex.t | 1 +
 1 file changed, 1 insertion(+)

diff --git a/t/v2reindex.t b/t/v2reindex.t
index 9bc271fc2d35..f8e2b1b2d46e 100644
--- a/t/v2reindex.t
+++ b/t/v2reindex.t
@@ -48,6 +48,7 @@ if ('test remove later') {
 $im->done;
 my $minmax = [ $ibx->mm->minmax ];
 ok(defined $minmax->[0] && defined $minmax->[1], 'minmax defined');
+is_deeply($minmax, [ 1, 10 ], 'minmax as expected');
 
 eval { $im->index_sync({reindex => 1}) };
 is($@, '', 'no error from reindexing');
-- 
2.17.1

[PATCH 2/4] t/search.t t/v2writable.t: Teach search tests to fail more cleanly.

[Eric W. Biederman]

Now that some of the indexes are optionals these tests might fail
so teach them to fail more cleanly.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
---
 t/search.t     | 45 ++++++++++++++++++++++++++-------------------
 t/v2writable.t |  2 +-
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/t/search.t b/t/search.t
index c971fe3ca5c7..3c758e68b738 100644
--- a/t/search.t
+++ b/t/search.t
@@ -93,7 +93,7 @@ sub filter_mids {
 	$ro->reopen;
 	my $found = $ro->query('m:root@s');
 	is(scalar(@$found), 1, "message found");
-	is($found->[0]->mid, 'root@s', 'mid set correctly');
+	is($found->[0]->mid, 'root@s', 'mid set correctly') if scalar(@$found);
 
 	my ($res, @res);
 	my @exp = sort qw(root@s last@s);
@@ -170,7 +170,8 @@ $ibx->with_umask(sub {
 
 	# body
 	$res = $ro->query('goodbye');
-	is($res->[0]->mid, 'last@s', 'got goodbye message body');
+	is(scalar(@$res), 1, "goodbye message found");
+	is($res->[0]->mid, 'last@s', 'got goodbye message body') if scalar(@$res);
 
 	# datestamp
 	$res = $ro->query('dt:20101002000001..20101002000001');
@@ -253,13 +254,13 @@ $ibx->with_umask(sub {
 		body => "theatre\nfade\n"));
 	my $res = $rw->query("theatre");
 	is(scalar(@$res), 2, "got both matches");
-	is($res->[0]->mid, 'nquote@a', "non-quoted scores higher");
-	is($res->[1]->mid, 'quote@a', "quoted result still returned");
+	is($res->[0]->mid, 'nquote@a', "non-quoted scores higher") if scalar(@$res);
+	is($res->[1]->mid, 'quote@a', "quoted result still returned") if scalar(@$res);
 
 	$res = $rw->query("illusions");
 	is(scalar(@$res), 1, "got a match for quoted text");
 	is($res->[0]->mid, 'quote@a',
-		"quoted result returned if nothing else");
+		"quoted result returned if nothing else") if scalar(@$res);
 });
 
 # circular references
@@ -278,8 +279,9 @@ $ibx->with_umask(sub {
 		body => "LOOP!\n"));
 	ok($doc_id > 0, "doc_id defined with circular reference");
 	my $smsg = $rw->query('m:circle@a', {limit=>1})->[0];
-	is($smsg->references, '', "no references created");
-	is($s, $smsg->subject, 'long subject not rewritten');
+	is(defined($smsg), 1, 'found m:circl@a');
+	is($smsg->references, '', "no references created") if defined($smsg);
+	is($smsg->subject, $s, 'long subject not rewritten') if defined($smsg);
 });
 
 $ibx->with_umask(sub {
@@ -294,7 +296,8 @@ $ibx->with_umask(sub {
 	my $doc_id = $rw->add_message($mime);
 	ok($doc_id > 0, 'message indexed doc_id with UTF-8');
 	my $msg = $rw->query('m:testmessage@example.com', {limit => 1})->[0];
-	is($mime->header('Subject'), $msg->subject, 'UTF-8 subject preserved');
+	is(defined($msg), 1, 'found testmessage@example.com');
+	is($mime->header('Subject'), $msg->subject, 'UTF-8 subject preserved') if defined($msg);
 });
 
 {
@@ -355,17 +358,17 @@ $ibx->with_umask(sub {
 
 	$res = $ro->query('q:theatre');
 	is(scalar(@$res), 1, 'only one quoted body');
-	like($res->[0]->from, qr/\AQuoter/, 'got quoted body');
+	like($res->[0]->from, qr/\AQuoter/, 'got quoted body') if scalar(@$res);
 
 	$res = $ro->query('nq:theatre');
 	is(scalar @$res, 1, 'only one non-quoted body');
-	like($res->[0]->from, qr/\ANon-Quoter/, 'got non-quoted body');
+	like($res->[0]->from, qr/\ANon-Quoter/, 'got non-quoted body') if scalar(@$res);
 
 	foreach my $pfx (qw(b: bs:)) {
 		$res = $ro->query($pfx . 'theatre');
 		is(scalar @$res, 2, "searched both bodies for $pfx");
 		like($res->[0]->from, qr/\ANon-Quoter/,
-			"non-quoter first for $pfx");
+			"non-quoter first for $pfx") if scalar(@$res);
 	}
 }
 
@@ -407,18 +410,22 @@ $ibx->with_umask(sub {
 	my $res = $ro->query('part_deux.txt');
 	is(scalar @$res, 1, 'got result without n:');
 	is($n->[0]->mid, $res->[0]->mid,
-		'same result with and without');
+		'same result with and without') if scalar(@$res);
 	my $txt = $ro->query('"inside another"');
+	is(scalar @$txt, 1, 'found inside another');
 	is($txt->[0]->mid, $res->[0]->mid,
-		'search inside text attachments works');
-
-	my $mid = $n->[0]->mid;
-	my ($id, $prev);
-	my $art = $ro->next_by_mid($mid, \$id, \$prev);
-	ok($art, 'article exists in OVER DB');
+		'search inside text attachments works') if scalar(@$txt);
+
+	my $art;
+	if (scalar(@$n) >= 1) {
+		my $mid = $n->[0]->mid;
+		my ($id, $prev);
+		$art = $ro->next_by_mid($mid, \$id, \$prev);
+		ok($art, 'article exists in OVER DB');
+	}
 	$rw->unindex_blob($amsg);
 	$rw->commit_txn_lazy;
-	is($ro->lookup_article($art->{num}), undef, 'gone from OVER DB');
+	is($ro->lookup_article($art->{num}), undef, 'gone from OVER DB') if defined($art);
 });
 
 foreach my $f ("$git_dir/public-inbox/msgmap.sqlite3",
diff --git a/t/v2writable.t b/t/v2writable.t
index 9e3bb755d9c2..b3cdbd3e6c0f 100644
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -125,7 +125,7 @@ if ('ensure git configs are correct') {
 	my $mset2 = $srch->reopen->query('m:abcde@2', { mset => 1 });
 	is($mset2->size, 1, 'message found by second MID');
 	is((($mset1->items)[0])->get_docid, (($mset2->items)[0])->get_docid,
-		'same document');
+		'same document') if ($mset1->size);
 }
 
 SKIP: {
-- 
2.17.1

[PATCH 3/4] t/v2reindex.t: Don't reuse $ibx as two different kinds of variable

[Eric W. Biederman]

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
---
 t/v2reindex.t | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/v2reindex.t b/t/v2reindex.t
index f8e2b1b2d46e..5bc307f1cac1 100644
--- a/t/v2reindex.t
+++ b/t/v2reindex.t
@@ -14,13 +14,13 @@ foreach my $mod (qw(DBD::SQLite Search::Xapian)) {
 }
 use_ok 'PublicInbox::V2Writable';
 my $mainrepo = tempdir('pi-v2reindex-XXXXXX', TMPDIR => 1, CLEANUP => 1);
-my $ibx = {
+my $ibx_config = {
 	mainrepo => $mainrepo,
 	name => 'test-v2writable',
 	version => 2,
 	-primary_address => 'test@example.com',
 };
-$ibx = PublicInbox::Inbox->new($ibx);
+my $ibx = PublicInbox::Inbox->new($ibx_config);
 my $mime = PublicInbox::MIME->create(
 	header => [
 		From => 'a@example.com',
-- 
2.17.1

[PATCH 4/4] t/v2reindex.t: Swap the order of minmax tests so errors make sense

[Eric W. Biederman]

Previously if a minmax test failed it would say it was expecting the
incorrect value, which is confusing when looking into why the test
fails.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
---
 t/v2reindex.t | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/t/v2reindex.t b/t/v2reindex.t
index 5bc307f1cac1..8af30991f858 100644
--- a/t/v2reindex.t
+++ b/t/v2reindex.t
@@ -63,7 +63,7 @@ $im->done;
 ok(-d $xap, 'Xapian directories recreated');
 
 delete $ibx->{mm};
-is_deeply($minmax, [ $ibx->mm->minmax ], 'minmax unchanged');
+is_deeply([ $ibx->mm->minmax ], $minmax, 'minmax unchanged');
 
 ok(unlink "$mainrepo/msgmap.sqlite3", 'remove msgmap');
 remove_tree($xap);
@@ -77,7 +77,7 @@ ok(!-d $xap, 'Xapian directories removed again');
 	$im->done;
 	ok(-d $xap, 'Xapian directories recreated');
 	delete $ibx->{mm};
-	is_deeply($minmax, [ $ibx->mm->minmax ], 'minmax unchanged');
+	is_deeply([ $ibx->mm->minmax ], $minmax, 'minmax unchanged');
 }
 
 ok(unlink "$mainrepo/msgmap.sqlite3", 'remove msgmap');
@@ -92,7 +92,7 @@ ok(!-d $xap, 'Xapian directories removed again');
 	$im->done;
 	ok(-d $xap, 'Xapian directories recreated');
 	delete $ibx->{mm};
-	is_deeply($minmax, [ $ibx->mm->minmax ], 'minmax unchanged');
+	is_deeply([ $ibx->mm->minmax ], $minmax, 'minmax unchanged');
 }
 
 done_testing();
-- 
2.17.1

Re: [PATCH 0/4] minor test cleanups

[Eric Wong]

"Eric W. Biederman" <ebiederm@xmission.com> wrote:
> While developing the ability to disable the indexes I found a few places
> where the existing tests could be slightly improved.

Thanks!  I'm not a very good test writer :x

> Here are my improvements.
> 
> Eric W. Biederman (4):
>       t/v2reindex.t: Ensure the numbers 1 to 10 are used
>       t/search.t t/v2writable.t: Teach search tests to fail more cleanly.

I'm not thrilled with the longer lines >=80 cols, but I won't
make you reroll, either.

>       t/v2reindex.t:  Don't reuse $ibx as two different kinds of variable
>       t/v2reindex.t: Swap the order of minmax tests so errors make sense

All four of these are pushed along with the regen_down fix for
v1.  Will await comments on index levels.  Thanks again.