1 files changed, 24 insertions, 39 deletions

diff --git a/t/psgi_attach.t b/t/psgi_attach.t
index 14d20adb..db551696 100644
--- a/t/psgi_attach.t
+++ b/t/psgi_attach.t
@@ -1,44 +1,37 @@
-# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
+#!perl -w
+# Copyright (C) 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 v5.10.1;
 use PublicInbox::TestCommon;
-my ($tmpdir, $for_destroy) = tmpdir();
-my $inboxdir = "$tmpdir/main.git";
-my $addr = 'test-public@example.com';
 my @mods = qw(HTTP::Request::Common Plack::Builder Plack::Test URI::Escape);
 require_mods(@mods);
 use_ok $_ foreach @mods;
 use_ok 'PublicInbox::WWW';
-use PublicInbox::Import;
-use PublicInbox::Git;
 use PublicInbox::Config;
 use PublicInbox::Eml;
 use_ok 'PublicInbox::WwwAttach';
-
-my $cfgpath = "$tmpdir/config";
-open my $fh, '>', $cfgpath or BAIL_OUT $!;
-print $fh <<EOF or BAIL_OUT $!;
+my $cfgpath;
+my $creat_cb = sub {
+        my ($im, $ibx) = @_;
+        $im->add(eml_load('t/psgi_attach.eml')) or BAIL_OUT;
+        $im->add(eml_load('t/data/message_embed.eml')) or BAIL_OUT;
+        $cfgpath = "$ibx->{inboxdir}/pi_config";
+        open my $fh, '>', $cfgpath or BAIL_OUT $!;
+        print $fh <<EOF or BAIL_OUT $!;
 [publicinbox "test"]
-        address = $addr
-        inboxdir = $inboxdir
+        address = $ibx->{-primary_address}
+        inboxdir = $ibx->{inboxdir}
 EOF
-close $fh or BAIL_OUT $!;
-my $config = PublicInbox::Config->new($cfgpath);
-my $git = PublicInbox::Git->new($inboxdir);
-my $im = PublicInbox::Import->new($git, 'test', $addr);
-$im->init_bare;
-
+        close $fh or BAIL_OUT $!;
+};
+my $ibx = create_inbox 'test', $creat_cb;
+$cfgpath //= "$ibx->{inboxdir}/pi_config";
 my $qp = "abcdef=g\n==blah\n";
 my $b64 = "b64\xde\xad\xbe\xef\n";
 my $txt = "plain\ntext\npass\nthrough\n";
 my $dot = "dotfile\n";
-$im->add(eml_load('t/psgi_attach.eml'));
-$im->add(eml_load('t/data/message_embed.eml'));
-$im->done;
-
-my $www = PublicInbox::WWW->new($config);
+my $www = PublicInbox::WWW->new(PublicInbox::Config->new($cfgpath));
 my $client = sub {
         my ($cb) = @_;
         my $res;
@@ -104,20 +97,12 @@ my $client = sub {
 
 test_psgi(sub { $www->call(@_) }, $client);
 SKIP: {
-        diag 'testing with index indexed';
-        require_mods('DBD::SQLite', 19);
+        require_mods(qw(DBD::SQLite), 18);
+        $ibx = create_inbox 'test-indexed', indexlevel => 'basic', $creat_cb;
+        $cfgpath = "$ibx->{inboxdir}/pi_config";
         my $env = { PI_CONFIG => $cfgpath };
-        ok(run_script(['-index', $inboxdir], $env), 'indexed');
-
+        $www = PublicInbox::WWW->new(PublicInbox::Config->new($cfgpath));
         test_psgi(sub { $www->call(@_) }, $client);
-
-        require_mods(qw(Plack::Test::ExternalServer), 18);
-        my $sock = tcp_server() or die;
-        my ($out, $err) = map { "$inboxdir/std$_.log" } qw(out err);
-        my $cmd = [ qw(-httpd -W0), "--stdout=$out", "--stderr=$err" ];
-        my $td = start_script($cmd, $env, { 3 => $sock });
-        my ($h, $p) = ($sock->sockhost, $sock->sockport);
-        local $ENV{PLACK_TEST_EXTERNALSERVER_URI} = "http://$h:$p";
-        Plack::Test::ExternalServer::test_psgi(client => $client);
+        test_httpd($env, $client);
 }
-done_testing();
+done_testing;