about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2021-08-08 01:14:16 +0000
committerEric Wong <e@80x24.org>2021-08-08 01:17:25 +0000
commit6bcc4f94adad46240da102c3e36a2b6df8e7ce38 (patch)
tree33558edd9b5a554d27d1c626091df639db0d9600
parentb5d21c2b21cc1c19b29d3298d14f207ba910a31d (diff)
downloadpublic-inbox-6bcc4f94adad46240da102c3e36a2b6df8e7ce38.tar.gz
We still support usage without Xapian, so ensure our tests
work when Xapian bindings are missing
-rw-r--r--t/imapd.t9
-rw-r--r--t/thread-index-gap.t4
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) {