* [PATCH 12/35] t/httpd: convert to create_inbox
2021-03-15 11:57 7% [PATCH 00/35] memoize inbox creations Eric Wong
@ 2021-03-15 11:58 5% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2021-03-15 11:58 UTC (permalink / raw)
To: meta
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;
^ permalink raw reply related [relevance 5%]
* [PATCH 00/35] memoize inbox creations
@ 2021-03-15 11:57 7% Eric Wong
2021-03-15 11:58 5% ` [PATCH 12/35] t/httpd: convert to create_inbox Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2021-03-15 11:57 UTC (permalink / raw)
To: meta
This speeds up a bunch of tests by a few dozen to hundreds of
milliseconds. Part of it is due to disabling fsync/fdatasync in
a few more places.
Users with slower TMPDIR will notice more, and users with TMPDIR
pointed to tmpfs will notice it least.
Overall it's not hugely significant, but the diffstat
and LoC reduction still makes it nice even if there were
no performance improvements.
Eric Wong (35):
test_common: add create_inbox helper sub
t/lei_xsearch: use create_inbox
test_common: minor simplifications to setup_public_inboxes
t/imapd-tls: switch to create_inbox
t/www_altid: use create_inbox
t/xcpdb-reshard: use create_inbox
t/v2dupindex: create_inbox
t/admin: switch to create_inbox
t/html_index: remove now-worthless test
t/plack: use create_inbox
t/psgi_attach: convert to create_inbox
t/httpd: convert to create_inbox
t/convert-compact: create_inbox
t/altid: use create_inbox
t/psgi_mount: switch to create_inbox
t/feed: switch to create_inbox
t/psgi_bad_mids: use create_inbox
t/psgi_multipart_not: use create_inbox
t/psgi_scan_all: create_inbox lots saved
t/psgi_v2: create_inbox
t/imapd: create_inbox (minor)
t/solver_git: use create_inbox
t/cgi: create_inbox
t/edit: switch to create_inbox
t/inbox_idle: switch to create_inbox
t/lei_xsearch: use create_inbox
t/indexlevels-mirror: use create_inbox
t/multi-mid: use create_inbox
t/psgi_search: use create_inbox
t/miscsearch: use create_inbox
t/nntpd-tls: use create_inbox
t/nntpd: use create_inbox
t/thread-index-gap: create_inbox
t/altid_v2: create_inbox
t/*: disable fsync on tests were create_inbox isn't worth it
MANIFEST | 2 +-
Makefile.PL | 3 +-
lib/PublicInbox/TestCommon.pm | 67 ++++++++++++++---
t/admin.t | 38 ++++------
t/altid.t | 26 ++-----
t/altid_v2.t | 48 +++++-------
t/cgi.t | 84 +++++++++------------
t/convert-compact.t | 48 +++++-------
t/data-gen/.gitignore | 2 +
t/edit.t | 34 ++++-----
t/extsearch.t | 2 +
t/feed.t | 53 ++++----------
t/html_index.t | 56 --------------
t/httpd.t | 36 +++------
t/imapd-tls.t | 38 +++-------
t/imapd.t | 66 ++++++++---------
t/inbox_idle.t | 31 ++++----
t/indexlevels-mirror.t | 24 +++---
t/lei-q-remote-import.t | 20 ++---
t/lei_xsearch.t | 56 +++++---------
t/miscsearch.t | 28 +++----
t/multi-mid.t | 34 +++------
t/nntpd-tls.t | 52 ++++---------
t/nntpd.t | 102 ++++++++++++--------------
t/plack.t | 69 +++++++----------
t/psgi_attach.t | 56 ++++++--------
t/psgi_bad_mids.t | 46 ++++--------
t/psgi_mount.t | 35 ++++-----
t/psgi_multipart_not.t | 35 +++------
t/psgi_scan_all.t | 48 ++++--------
t/psgi_search.t | 37 +++-------
t/psgi_v2.t | 134 ++++++++++++++++------------------
t/purge.t | 1 +
t/replace.t | 1 +
t/solver_git.t | 88 +++++++++++-----------
t/thread-index-gap.t | 24 +++---
t/v1reindex.t | 1 +
t/v2-add-remove-add.t | 1 +
t/v2dupindex.t | 76 +++++++++----------
t/v2mirror.t | 1 +
t/v2reindex.t | 1 +
t/v2writable.t | 1 +
t/watch_filter_rubylang.t | 2 +
t/watch_maildir_v2.t | 1 +
t/www_altid.t | 47 +++++-------
t/xcpdb-reshard.t | 54 ++++++--------
46 files changed, 692 insertions(+), 1017 deletions(-)
create mode 100644 t/data-gen/.gitignore
delete mode 100644 t/html_index.t
^ permalink raw reply [relevance 7%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2021-03-15 11:57 7% [PATCH 00/35] memoize inbox creations Eric Wong
2021-03-15 11:58 5% ` [PATCH 12/35] t/httpd: convert to create_inbox Eric Wong
Code repositories for project(s) associated with this public 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).