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 C54E71F8C7 for ; Sun, 8 Aug 2021 01:14:17 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 1/2] tests: fix test failures when Xapian is missing Date: Sun, 8 Aug 2021 01:14:16 +0000 Message-Id: <20210808011417.26927-2-e@80x24.org> In-Reply-To: <20210808011417.26927-1-e@80x24.org> References: <20210808011417.26927-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: 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 < "$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) {