From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 3490E1F466 for ; Sun, 5 Jan 2020 02:05:16 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] search: remove lookup_article Date: Sun, 5 Jan 2020 02:05:15 +0000 Message-Id: <20200105020515.11935-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: It was no longer used outside of tests, so don't penalize regular users with the extra function. Just inline it for t/search.t. --- lib/PublicInbox/Search.pm | 5 ----- t/search.t | 12 ++++++++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm index f897b833..aff3d48b 100644 --- a/lib/PublicInbox/Search.pm +++ b/lib/PublicInbox/Search.pm @@ -336,11 +336,6 @@ EOF $self->{query_parser} = $qp; } -sub lookup_article { - my ($self, $num) = @_; - $self->{over_ro}->get_art($num); -} - sub help { my ($self) = @_; $self->qp; # parse altids diff --git a/t/search.t b/t/search.t index b9aa995b..240139b0 100644 --- a/t/search.t +++ b/t/search.t @@ -319,14 +319,14 @@ $ibx->with_umask(sub { my $mset = $ro->query('t:list@example.com', {mset => 1}); is($mset->size, 6, 'searched To: successfully'); foreach my $m ($mset->items) { - my $smsg = $ro->lookup_article($m->get_docid); + my $smsg = $ro->{over_ro}->get_art($m->get_docid); like($smsg->to, qr/\blist\@example\.com\b/, 'to appears'); } $mset = $ro->query('tc:list@example.com', {mset => 1}); is($mset->size, 6, 'searched To+Cc: successfully'); foreach my $m ($mset->items) { - my $smsg = $ro->lookup_article($m->get_docid); + my $smsg = $ro->{over_ro}->get_art($m->get_docid); my $tocc = join("\n", $smsg->to, $smsg->cc); like($tocc, qr/\blist\@example\.com\b/, 'tocc appears'); } @@ -335,7 +335,7 @@ $ibx->with_umask(sub { my $mset = $ro->query($pfx . 'foo@example.com', { mset => 1 }); is($mset->items, 1, "searched $pfx successfully for Cc:"); foreach my $m ($mset->items) { - my $smsg = $ro->lookup_article($m->get_docid); + my $smsg = $ro->{over_ro}->get_art($m->get_docid); like($smsg->cc, qr/\bfoo\@example\.com\b/, 'cc appears'); } @@ -432,7 +432,11 @@ $ibx->with_umask(sub { } $rw->unindex_blob($amsg); $rw->commit_txn_lazy; - is($ro->lookup_article($art->{num}), undef, 'gone from OVER DB') if defined($art); + SKIP: { + skip('$art not defined', 1) unless defined $art; + is($ro->{over_ro}->get_art($art->{num}), undef, + 'gone from OVER DB'); + }; }); my $all_mask = 07777;