From: Eric Wong <e@80x24.org> 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 [thread overview] Message-ID: <20210315115826.17591-12-e@80x24.org> (raw) In-Reply-To: <20210315115826.17591-1-e@80x24.org> 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 <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,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;
next prev parent reply other threads:[~2021-03-15 11:58 UTC|newest] Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-03-15 11:57 [PATCH 00/35] memoize inbox creations Eric Wong 2021-03-15 11:57 ` [PATCH 01/35] test_common: add create_inbox helper sub Eric Wong 2021-03-15 11:57 ` [PATCH 02/35] t/lei_xsearch: use create_inbox Eric Wong 2021-03-15 11:57 ` [PATCH 03/35] test_common: minor simplifications to setup_public_inboxes Eric Wong 2021-03-15 11:57 ` [PATCH 04/35] t/imapd-tls: switch to create_inbox Eric Wong 2021-03-15 11:57 ` [PATCH 05/35] t/www_altid: use create_inbox Eric Wong 2021-03-15 11:57 ` [PATCH 06/35] t/xcpdb-reshard: " Eric Wong 2021-03-15 11:57 ` [PATCH 07/35] t/v2dupindex: create_inbox Eric Wong 2021-03-15 11:57 ` [PATCH 08/35] t/admin: switch to create_inbox Eric Wong 2021-03-15 19:51 ` [SQUASH] " Eric Wong 2021-03-15 11:58 ` [PATCH 09/35] t/html_index: remove now-worthless test Eric Wong 2021-03-15 11:58 ` [PATCH 10/35] t/plack: use create_inbox Eric Wong 2021-03-15 11:58 ` Eric Wong [this message] 2021-03-15 11:58 ` [PATCH 12/35] t/httpd: convert to create_inbox Eric Wong 2021-03-15 11:58 ` [PATCH 13/35] t/convert-compact: create_inbox Eric Wong 2021-03-15 11:58 ` [PATCH 14/35] t/altid: use create_inbox Eric Wong 2021-03-15 11:58 ` [PATCH 15/35] t/psgi_mount: switch to create_inbox Eric Wong 2021-03-15 11:58 ` [PATCH 16/35] t/feed: " Eric Wong 2021-03-15 11:58 ` [PATCH 17/35] t/psgi_bad_mids: use create_inbox Eric Wong 2021-03-15 11:58 ` [PATCH 18/35] t/psgi_multipart_not: " Eric Wong 2021-03-15 11:58 ` [PATCH 19/35] t/psgi_scan_all: create_inbox lots saved Eric Wong 2021-03-15 11:58 ` [PATCH 20/35] t/psgi_v2: create_inbox Eric Wong 2021-03-15 11:58 ` [PATCH 21/35] t/imapd: create_inbox (minor) Eric Wong 2021-03-15 11:58 ` [PATCH 22/35] t/solver_git: use create_inbox Eric Wong 2021-03-15 11:58 ` [PATCH 23/35] t/cgi: create_inbox Eric Wong 2021-03-15 11:58 ` [PATCH 24/35] t/edit: switch to create_inbox Eric Wong 2021-03-15 11:58 ` [PATCH 25/35] t/inbox_idle: " Eric Wong 2021-03-15 11:58 ` [PATCH 26/35] t/lei_xsearch: use create_inbox Eric Wong 2021-03-15 11:58 ` [PATCH 27/35] t/indexlevels-mirror: " Eric Wong 2021-03-15 11:58 ` [PATCH 28/35] t/multi-mid: " Eric Wong 2021-03-15 11:58 ` [PATCH 29/35] t/psgi_search: " Eric Wong 2021-03-15 11:58 ` [PATCH 30/35] t/miscsearch: " Eric Wong 2021-03-15 11:58 ` [PATCH 31/35] t/nntpd-tls: " Eric Wong 2021-03-15 11:58 ` [PATCH 32/35] t/nntpd: " Eric Wong 2021-03-15 11:58 ` [PATCH 33/35] t/thread-index-gap: create_inbox Eric Wong 2021-03-15 11:58 ` [PATCH 34/35] t/altid_v2: create_inbox Eric Wong 2021-03-15 11:58 ` [PATCH 35/35] t/*: disable fsync on tests were create_inbox isn't worth it Eric Wong
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: https://public-inbox.org/README * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210315115826.17591-12-e@80x24.org \ --to=e@80x24.org \ --cc=meta@public-inbox.org \ --subject='Re: [PATCH 11/35] t/psgi_attach: convert to create_inbox' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Code repositories for project(s) associated with this inbox: https://80x24.org/public-inbox.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).