From: Eric Wong (Contractor, The Linux Foundation) <e@80x24.org>
Date: Thu, 19 Apr 2018 19:23:32 +0000 (+0000)
Subject: fix tests to run without Xapian installed
X-Git-Tag: v1.1.0-pre1~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b4404feb5925bae6fc5985894f4c7c2593247eda;p=thirdparty%2Fpublic-inbox.git

fix tests to run without Xapian installed

We'll be ensuring we can run more of the HTTP and all of the
NNTP interface with only SQLite (and not Xapian) installed
in the future.
---

diff --git a/t/over.t b/t/over.t
index c0d9d5e54..7a3c97210 100644
--- a/t/over.t
+++ b/t/over.t
@@ -5,7 +5,8 @@ use warnings;
 use Test::More;
 use File::Temp qw/tempdir/;
 use Compress::Zlib qw(compress);
-foreach my $mod (qw(DBD::SQLite)) {
+# FIXME: allow using Over w/o Xapian
+foreach my $mod (qw(DBD::SQLite Search::Xapian)) {
 	eval "require $mod";
 	plan skip_all => "$mod missing for over.t" if $@;
 }
diff --git a/t/v1-add-remove-add.t b/t/v1-add-remove-add.t
index cd6e28110..1e11c71e2 100644
--- a/t/v1-add-remove-add.t
+++ b/t/v1-add-remove-add.t
@@ -5,13 +5,13 @@ use warnings;
 use Test::More;
 use PublicInbox::MIME;
 use PublicInbox::Import;
-use PublicInbox::SearchIdx;
 use File::Temp qw/tempdir/;
 
 foreach my $mod (qw(DBD::SQLite Search::Xapian)) {
 	eval "require $mod";
 	plan skip_all => "$mod missing for v1-add-remove-add.t" if $@;
 }
+require PublicInbox::SearchIdx;
 my $mainrepo = tempdir('pi-add-remove-add-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 is(system(qw(git init --bare), $mainrepo), 0);
 my $ibx = {