From c39e72419ad420e21633d8b5f87ebb9c2ddcded4 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 23 Nov 2020 07:05:57 +0000 Subject: [PATCH] extsearch: fix remaining "eindex" references We'll replace "$EINDEX" => "$EXTINDEX" in a user-visible line and also some hacker-only tests. "eindex" is no longer used because it rhymes with "reindex", so remove the last instance of it. Fixes: 6b0fed3b03263ba2 ("extsearch: rename -eindex to -extindex") --- lib/PublicInbox/ExtSearch.pm | 2 +- t/extsearch.t | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/PublicInbox/ExtSearch.pm b/lib/PublicInbox/ExtSearch.pm index c41ae443..dd93cd32 100644 --- a/lib/PublicInbox/ExtSearch.pm +++ b/lib/PublicInbox/ExtSearch.pm @@ -57,7 +57,7 @@ sub description { my ($self) = @_; ($self->{description} //= PublicInbox::Inbox::cat_desc("$self->{topdir}/description")) // - '$EINDEX_DIR/description missing'; + '$EXTINDEX_DIR/description missing'; } sub cloneurl { [] } # TODO diff --git a/t/extsearch.t b/t/extsearch.t index dc825bf4..0045294b 100644 --- a/t/extsearch.t +++ b/t/extsearch.t @@ -35,9 +35,9 @@ seek($fh, 0, SEEK_SET) or BAIL_OUT $!; run_script(['-mda', '--no-precheck'], $env, { 0 => $fh }) or BAIL_OUT '-mda'; run_script(['-index', "$home/v1test"]) or BAIL_OUT "index $?"; -ok(run_script([qw(-extindex --all), "$home/eindex"]), 'extindex init'); +ok(run_script([qw(-extindex --all), "$home/extindex"]), 'extindex init'); -my $es = PublicInbox::ExtSearch->new("$home/eindex"); +my $es = PublicInbox::ExtSearch->new("$home/extindex"); { my $smsg = $es->over->get_art(1); ok($smsg, 'got first article'); @@ -55,7 +55,7 @@ my $es = PublicInbox::ExtSearch->new("$home/eindex"); my $env = { MAIL_EDITOR => "$^X -i -p -e 's/test message/BEST MSG/'" }; my $cmd = [ qw(-edit -Ft/utf8.eml), "$home/v2test" ]; ok(run_script($cmd, $env, $opt), '-edit'); - ok(run_script([qw(-extindex --all), "$home/eindex"], undef, $opt), + ok(run_script([qw(-extindex --all), "$home/extindex"], undef, $opt), 'extindex again'); like($err, qr/discontiguous range/, 'warned about discontiguous range'); my $msg1 = $es->over->get_art(1) or BAIL_OUT 'msg1 missing'; -- 2.44.0