X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fpsgi_search.t;h=5310e5aba9553bbabf252da82c97d3a520c9165e;hb=62f28026e624ed30d620063a0fa92cbedb7f6673;hp=a65076769e976fe2c251bb54c1f1309bcdcc6cd5;hpb=b77c87a6fce05c4f2048aa0a73fde7b25a2b0002;p=public-inbox.git

diff --git a/t/psgi_search.t b/t/psgi_search.t
index a6507676..5310e5ab 100644
--- a/t/psgi_search.t
+++ b/t/psgi_search.t
@@ -1,26 +1,29 @@
-# Copyright (C) 2017-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2017-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
 use Test::More;
-use File::Temp qw/tempdir/;
 use Email::MIME;
 use PublicInbox::Config;
-use PublicInbox::WWW;
+use PublicInbox::Inbox;
+use PublicInbox::InboxWritable;
 use bytes (); # only for bytes::length
+use PublicInbox::TestCommon;
 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, qw(PublicInbox::SearchIdx));
-my $tmpdir = tempdir('pi-psgi-search.XXXXXX', TMPDIR => 1, CLEANUP => 1);
-my $git_dir = "$tmpdir/a.git";
+require_mods(@mods);
+use_ok($_) for (qw(HTTP::Request::Common Plack::Test));
+use_ok 'PublicInbox::WWW';
+my ($tmpdir, $for_destroy) = tmpdir();
 
-is(0, system(qw(git init -q --bare), $git_dir), "git init (main)");
-my $rw = PublicInbox::SearchIdx->new($git_dir, 1);
-ok($rw, "search indexer created");
+my $ibx = PublicInbox::Inbox->new({
+	inboxdir => $tmpdir,
+	address => 'git@vger.kernel.org',
+	name => 'test',
+});
+$ibx = PublicInbox::InboxWritable->new($ibx);
+$ibx->init_inbox(1);
+my $im = $ibx->importer(0);
 my $digits = '10010260936330';
 my $ua = 'Pine.LNX.4.10';
 my $mid = "$ua.$digits.2460-100000\@penguin.transmeta.com";
@@ -32,25 +35,16 @@ To: git\@vger.kernel.org
 
 EOF
 
-my $num = 0;
-# nb. using internal API, fragile!
-$rw->begin_txn_lazy;
-
-foreach (reverse split(/\n\n/, $data)) {
-	$_ .= "\n";
-	my $mime = Email::MIME->new(\$_);
-	my $bytes = bytes::length($mime->as_string);
-	my $doc_id = $rw->add_message($mime, $bytes, ++$num, 'ignored');
-	ok($doc_id, 'message added');
-}
-
-$rw->commit_txn_lazy;
+my $mime = Email::MIME->new(\$data);
+$im->add($mime);
+$im->done;
+PublicInbox::SearchIdx->new($ibx, 1)->index_sync;
 
 my $cfgpfx = "publicinbox.test";
-my $config = PublicInbox::Config->new({
-	"$cfgpfx.address" => 'git@vger.kernel.org',
-	"$cfgpfx.mainrepo" => $git_dir,
-});
+my $config = PublicInbox::Config->new(\<<EOF);
+$cfgpfx.address=git\@vger.kernel.org
+$cfgpfx.inboxdir=$tmpdir
+EOF
 my $www = PublicInbox::WWW->new($config);
 test_psgi(sub { $www->call(@_) }, sub {
 	my ($cb) = @_;