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-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 2BC101FC97 for ; Mon, 15 Mar 2021 11:58:29 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 11/35] t/psgi_attach: convert to create_inbox Date: Mon, 15 Mar 2021 12:58:02 +0100 Message-Id: <20210315115826.17591-12-e@80x24.org> In-Reply-To: <20210315115826.17591-1-e@80x24.org> References: <20210315115826.17591-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Another few dozen milliseconds saved. --- t/psgi_attach.t | 56 +++++++++++++++++++++---------------------------- 1 file changed, 24 insertions(+), 32 deletions(-) diff --git a/t/psgi_attach.t b/t/psgi_attach.t index f53b7510..79665d6f 100644 --- a/t/psgi_attach.t +++ b/t/psgi_attach.t @@ -1,44 +1,37 @@ +#!perl -w # Copyright (C) 2016-2021 all contributors # License: AGPL-3.0+ 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 <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 <{-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,19 @@ 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 Plack::Test::ExternalServer), 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 ($tmpdir, $for_destroy) = tmpdir(); + my ($out, $err) = map { "$tmpdir/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) = tcp_host_port($sock); local $ENV{PLACK_TEST_EXTERNALSERVER_URI} = "http://$h:$p"; Plack::Test::ExternalServer::test_psgi(client => $client); } -done_testing(); +done_testing;