Merge remote-tracking branch 'origin/ds'

[public-inbox.git] / t / psgi_search.t

diff --git a/t/psgi_search.t b/t/psgi_search.t
index a057a994f3cbe38f17962c59e8c4e7d1f7a9c7ca..bbf5a96a718773ca8a6cafe90ca36dae4c012f62 100644 (file)
--- a/t/psgi_search.t
+++ b/t/psgi_search.t
@@ -6,19 +6,22 @@ use Test::More;
 use File::Temp qw/tempdir/;
 use Email::MIME;
 use PublicInbox::Config;
+use PublicInbox::Inbox;
 use PublicInbox::WWW;
-my @mods = qw(PublicInbox::SearchIdx HTTP::Request::Common Plack::Test
+use bytes (); # only for bytes::length
+my @mods = qw(DBD::SQLite Search::Xapian HTTP::Request::Common Plack::Test
                URI::Escape Plack::Builder);
 foreach my $mod (@mods) {
        eval "require $mod";
        plan skip_all => "$mod missing for psgi_search.t" if $@;
 }
-use_ok $_ foreach @mods;
+use_ok $_ foreach (@mods, qw(PublicInbox::SearchIdx));
 my $tmpdir = tempdir('pi-psgi-search.XXXXXX', TMPDIR => 1, CLEANUP => 1);
 my $git_dir = "$tmpdir/a.git";
 
 is(0, system(qw(git init -q --bare), $git_dir), "git init (main)");
-my $rw = PublicInbox::SearchIdx->new($git_dir, 1);
+my $ibx = PublicInbox::Inbox->new({mainrepo => $git_dir});
+my $rw = PublicInbox::SearchIdx->new($ibx, 1);
 ok($rw, "search indexer created");
 my $digits = '10010260936330';
 my $ua = 'Pine.LNX.4.10';