From: Eric Wong <e@80x24.org> To: meta@public-inbox.org Subject: [PATCH 31/35] t/nntpd-tls: use create_inbox Date: Mon, 15 Mar 2021 12:58:22 +0100 [thread overview] Message-ID: <20210315115826.17591-32-e@80x24.org> (raw) In-Reply-To: <20210315115826.17591-1-e@80x24.org> Another 100ms or so saved. --- t/nntpd-tls.t | 52 ++++++++++++++++----------------------------------- 1 file changed, 16 insertions(+), 36 deletions(-) diff --git a/t/nntpd-tls.t b/t/nntpd-tls.t index 8dab4ca8..2c09d34e 100644 --- a/t/nntpd-tls.t +++ b/t/nntpd-tls.t @@ -1,10 +1,10 @@ +#!perl -w # Copyright (C) 2019-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 Socket qw(SOCK_STREAM IPPROTO_TCP SOL_SOCKET); +use v5.10.1; use PublicInbox::TestCommon; +use Socket qw(SOCK_STREAM IPPROTO_TCP SOL_SOCKET); # IO::Poll and Net::NNTP are part of the standard library, but # distros may split them off... require_mods(qw(DBD::SQLite IO::Socket::SSL Net::NNTP IO::Poll)); @@ -20,9 +20,6 @@ unless (-r $key && -r $cert) { use_ok 'PublicInbox::TLS'; use_ok 'IO::Socket::SSL'; -require PublicInbox::InboxWritable; -require PublicInbox::Eml; -require PublicInbox::SearchIdx; our $need_zlib; eval { require Compress::Raw::Zlib } or $need_zlib = 'Compress::Raw::Zlib missing'; @@ -31,45 +28,28 @@ require_git('2.6') if $version >= 2; my ($tmpdir, $for_destroy) = tmpdir(); my $err = "$tmpdir/stderr.log"; my $out = "$tmpdir/stdout.log"; -my $inboxdir = "$tmpdir"; -my $pi_config = "$tmpdir/pi_config"; my $group = 'test-nntpd-tls'; my $addr = $group . '@example.com'; my $starttls = tcp_server(); my $nntps = tcp_server(); -my $ibx = PublicInbox::Inbox->new({ - inboxdir => $inboxdir, - name => 'nntpd-tls', - version => $version, - -primary_address => $addr, - indexlevel => 'basic', -}); -$ibx = PublicInbox::InboxWritable->new($ibx, {nproc=>1}); -$ibx->init_inbox(0); -{ - open my $fh, '>', $pi_config or die "open: $!\n"; - print $fh <<EOF +my $pi_config; +my $ibx = create_inbox "v$version", version => $version, indexlevel => 'basic', + sub { + my ($im, $ibx) = @_; + $pi_config = "$ibx->{inboxdir}/pi_config"; + open my $fh, '>', $pi_config or BAIL_OUT "open: $!"; + print $fh <<EOF or BAIL_OUT; [publicinbox "nntpd-tls"] - inboxdir = $inboxdir + inboxdir = $ibx->{inboxdir} address = $addr indexlevel = basic newsgroup = $group EOF - ; - close $fh or die "close: $!\n"; -} - -{ - my $im = $ibx->importer(0); - my $mime = eml_load 't/data/0001.patch'; - ok($im->add($mime), 'message added'); - $im->done; - if ($version == 1) { - my $s = PublicInbox::SearchIdx->new($ibx, 1); - $s->index_sync; - } -} - + close $fh or BAIL_OUT "close: $!"; + $im->add(eml_load 't/data/0001.patch') or BAIL_OUT; +}; +$pi_config //= "$ibx->{inboxdir}/pi_config"; +undef $ibx; my $nntps_addr = tcp_host_port($nntps); my $starttls_addr = tcp_host_port($starttls); my $env = { PI_CONFIG => $pi_config };
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 ` [PATCH 11/35] t/psgi_attach: convert to create_inbox Eric Wong 2021-03-15 11:58 ` [PATCH 12/35] t/httpd: " 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 ` Eric Wong [this message] 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-32-e@80x24.org \ --to=e@80x24.org \ --cc=meta@public-inbox.org \ --subject='Re: [PATCH 31/35] t/nntpd-tls: use 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).