* [PATCH 1/2] tests: fix test failures when Xapian is missing
2021-08-08 1:14 5% [PATCH 0/2] fix handling of missing Xapian Eric Wong
@ 2021-08-08 1:14 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2021-08-08 1:14 UTC (permalink / raw)
To: meta
We still support usage without Xapian, so ensure our tests
work when Xapian bindings are missing
---
t/imapd.t | 9 ++++++---
t/thread-index-gap.t | 4 ++--
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/t/imapd.t b/t/imapd.t
index 8cdb4e4a..906b6926 100644
--- a/t/imapd.t
+++ b/t/imapd.t
@@ -39,7 +39,8 @@ print $cfgfh <<EOM or BAIL_OUT;
EOM
my $eml;
for my $V (@V) {
- my $ibx = create_inbox("i$V", tmpdir => "$tmpdir/i$V", version => $V,
+ my $ibx = create_inbox("i$V-$level",
+ tmpdir => "$tmpdir/i$V", version => $V,
indexlevel => $level, sub {
my ($im) = @_;
$im->add($eml //= eml_load('t/utf8.eml')) or BAIL_OUT;
@@ -52,6 +53,7 @@ for my $V (@V) {
address = $ibx->{-primary_address};
newsgroup = inbox.i$V
url = http://example.com/i$V
+ indexlevel = $level
EOF
}
close $cfgfh or BAIL_OUT;
@@ -444,7 +446,7 @@ SKIP: {
mkdir "$home/.public-inbox" or BAIL_OUT $!;
local $ENV{HOME} = $home;
my $name = 'watchimap';
- my $addr = "i1\@example.com";
+ my $addr = "i1-$level\@example.com";
my $url = "http://example.com/i1";
my $inboxdir = "$tmpdir/watchimap";
my $cmd = ['-init', '-V2', '-Lbasic', $name, $inboxdir, $url, $addr];
@@ -472,7 +474,8 @@ SKIP: {
open my $fh, '<', 't/iso-2202-jp.eml' or BAIL_OUT $!;
$old_env->{ORIGINAL_RECIPIENT} = $addr;
ok(run_script([qw(-mda --no-precheck)], $old_env, { 0 => $fh }),
- 'delivered a message for IDLE to kick -watch');
+ 'delivered a message for IDLE to kick -watch') or
+ diag "mda error \$?=$?";
diag 'waiting for IMAP IDLE wakeup';
PublicInbox::DS->SetPostLoopCallback(undef);
PublicInbox::DS->EventLoop;
diff --git a/t/thread-index-gap.t b/t/thread-index-gap.t
index d3cb6204..15c362f0 100644
--- a/t/thread-index-gap.t
+++ b/t/thread-index-gap.t
@@ -31,9 +31,9 @@ EOF
my ($home, $for_destroy) = tmpdir();
for my $msgs (['orig', reverse @msgs], ['shuffle', shuffle(@msgs)]) {
my $desc = shift @$msgs;
- my $n = "index-cap-$desc";
+ my $n = "index-cap-$desc-basic";
# yes, the shuffle case gets memoized by create_inbox, oh well
- my $ibx = create_inbox $desc, version => 2, indexlevel => 'full',
+ my $ibx = create_inbox $desc, version => 2, indexlevel => 'basic',
tmpdir => "$home/$desc", sub {
my ($im) = @_;
for my $m (@$msgs) {
^ permalink raw reply related [relevance 7%]
* [PATCH 0/2] fix handling of missing Xapian
@ 2021-08-08 1:14 5% Eric Wong
2021-08-08 1:14 7% ` [PATCH 1/2] tests: fix test failures when Xapian is missing Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2021-08-08 1:14 UTC (permalink / raw)
To: meta
Xapian is still optional, and we should handle it better and
avoid confusing users if something is broken.
Eric Wong (2):
tests: fix test failures when Xapian is missing
searchidx: die on Xapian load errors
lib/PublicInbox/SearchIdx.pm | 6 +++---
lib/PublicInbox/Xapcmd.pm | 2 +-
t/imapd.t | 9 ++++++---
t/thread-index-gap.t | 4 ++--
4 files changed, 12 insertions(+), 9 deletions(-)
^ permalink raw reply [relevance 5%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2021-08-08 1:14 5% [PATCH 0/2] fix handling of missing Xapian Eric Wong
2021-08-08 1:14 7% ` [PATCH 1/2] tests: fix test failures when Xapian is missing Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).