From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS6315 166.70.0.0/16 X-Spam-Status: No, score=-3.7 required=3.0 tests=AWL,BAYES_00, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.1 Received: from out02.mta.xmission.com (out02.mta.xmission.com [166.70.13.232]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id B32A7208E9; Wed, 18 Jul 2018 00:32:45 +0000 (UTC) Received: from in02.mta.xmission.com ([166.70.13.52]) by out02.mta.xmission.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.87) (envelope-from ) id 1ffaOa-0000IR-PJ; Tue, 17 Jul 2018 18:32:44 -0600 Received: from [97.119.167.31] (helo=x220.int.ebiederm.org) by in02.mta.xmission.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.87) (envelope-from ) id 1ffaOZ-0005nf-F3; Tue, 17 Jul 2018 18:32:44 -0600 From: "Eric W. Biederman" To: Eric Wong Cc: meta@public-inbox.org, "Eric W. Biederman" Date: Tue, 17 Jul 2018 19:31:59 -0500 Message-Id: <20180718003201.31740-2-ebiederm@xmission.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <87sh4hidvg.fsf@xmission.com> References: <87sh4hidvg.fsf@xmission.com> X-XM-SPF: eid=1ffaOZ-0005nf-F3;;;mid=<20180718003201.31740-2-ebiederm@xmission.com>;;;hst=in02.mta.xmission.com;;;ip=97.119.167.31;;;frm=ebiederm@xmission.com;;;spf=neutral X-XM-AID: U2FsdGVkX1+AwOn3/0h2izU2uWWm8pNzDlsU3oxRnAI= X-SA-Exim-Connect-IP: 97.119.167.31 X-SA-Exim-Mail-From: ebiederm@xmission.com Subject: [PATCH 2/4] t/search.t t/v2writable.t: Teach search tests to fail more cleanly. X-SA-Exim-Version: 4.2.1 (built Thu, 05 May 2016 13:38:54 -0600) X-SA-Exim-Scanned: Yes (on in02.mta.xmission.com) List-Id: 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" --- 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