From: Eric Wong <e@80x24.org> To: meta@public-inbox.org Subject: [PATCH 12/35] t/httpd: convert to create_inbox Date: Mon, 15 Mar 2021 12:58:03 +0100 [thread overview] Message-ID: <20210315115826.17591-13-e@80x24.org> (raw) In-Reply-To: <20210315115826.17591-1-e@80x24.org> No real difference, here, but having less code is nice. --- t/httpd.t | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/t/httpd.t b/t/httpd.t index af9fbfeb..0354a733 100644 --- a/t/httpd.t +++ b/t/httpd.t @@ -1,8 +1,8 @@ +#!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; use PublicInbox::Eml; use Socket qw(IPPROTO_TCP SOL_SOCKET); @@ -13,22 +13,15 @@ my ($tmpdir, $for_destroy) = tmpdir(); my $home = "$tmpdir/pi-home"; my $err = "$tmpdir/stderr.log"; my $out = "$tmpdir/stdout.log"; -my $maindir = "$tmpdir/main.git"; +my $inboxdir = "$tmpdir/i.git"; my $group = 'test-httpd'; my $addr = $group . '@example.com'; -my $cfgpfx = "publicinbox.$group"; my $sock = tcp_server(); my $td; -use_ok 'PublicInbox::Git'; -use_ok 'PublicInbox::Import'; { - local $ENV{HOME} = $home; - my $cmd = [ '-init', $group, $maindir, 'http://example.com/', $addr ]; - ok(run_script($cmd), 'init ran properly'); - - # ensure successful message delivery - { - my $mime = PublicInbox::Eml->new(<<EOF); + create_inbox 'test', tmpdir => $inboxdir, sub { + my ($im, $ibx) = @_; + $im->add(PublicInbox::Eml->new(<<EOF)) or BAIL_OUT; From: Me <me\@example.com> To: You <you\@example.com> Cc: $addr @@ -38,12 +31,10 @@ Date: Thu, 01 Jan 1970 06:06:06 +0000 nntp EOF - - my $git = PublicInbox::Git->new($maindir); - my $im = PublicInbox::Import->new($git, 'test', $addr); - $im->add($mime); - $im->done($mime); - } + }; + local $ENV{HOME} = $home; + my $cmd = [ '-init', $group, $inboxdir, 'http://example.com/', $addr ]; + ok(run_script($cmd), 'init ran properly'); $cmd = [ '-httpd', '-W0', "--stdout=$out", "--stderr=$err" ]; $td = start_script($cmd, undef, { 3 => $sock }); my $http_pfx = 'http://'.tcp_host_port($sock); @@ -53,7 +44,6 @@ EOF like(<$bad>, qr!\AHTTP/1\.[01] 405\b!, 'got 405 on bad req'); } my $conn = tcp_connect($sock); - ok($conn, 'connected'); ok($conn->write("GET / HTTP/1.0\r\n\r\n"), 'wrote data to socket'); { my $buf; @@ -67,7 +57,7 @@ EOF 0, 'smart clone successful'); # ensure dumb cloning works, too: - is(xsys('git', "--git-dir=$maindir", + is(xsys('git', "--git-dir=$inboxdir", qw(config http.uploadpack false)), 0, 'disable http.uploadpack'); is(xsys(qw(git clone -q --mirror), @@ -99,6 +89,4 @@ SKIP: { like($x, qr/\Ahttpready\0+\z/, 'got httpready accf for HTTP'); }; -done_testing(); - -1; +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 ` [PATCH 11/35] t/psgi_attach: convert to create_inbox Eric Wong 2021-03-15 11:58 ` Eric Wong [this message] 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-13-e@80x24.org \ --to=e@80x24.org \ --cc=meta@public-inbox.org \ --subject='Re: [PATCH 12/35] t/httpd: 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).