From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 14/29] t/init: convert to using run_script
Date: Fri, 15 Nov 2019 09:50:45 +0000 [thread overview]
Message-ID: <20191115095100.25633-15-e@80x24.org> (raw)
In-Reply-To: <20191115095100.25633-1-e@80x24.org>
This gives a 2-3x speedup on the test with the default
run_mode=1.
---
t/init.t | 85 ++++++++++++++++++++++++--------------------------------
1 file changed, 37 insertions(+), 48 deletions(-)
diff --git a/t/init.t b/t/init.t
index 0cd6f31f..2442eeec 100644
--- a/t/init.t
+++ b/t/init.t
@@ -7,55 +7,44 @@ use PublicInbox::Config;
use File::Temp qw/tempdir/;
require './t/common.perl';
my $tmpdir = tempdir('pi-init-XXXXXX', TMPDIR => 1, CLEANUP => 1);
-use constant pi_init => 'blib/script/public-inbox-init';
-use PublicInbox::Import;
use File::Basename;
-use PublicInbox::Spawn qw(spawn);
-use Cwd qw(getcwd);
-open my $null, '>>', '/dev/null';
-my $rdr = { 2 => fileno($null) };
sub quiet_fail {
my ($cmd, $msg) = @_;
- # run_die doesn't take absolute paths:
- my $path = $ENV{PATH};
- if (index($cmd->[0], '/') >= 0) {
- my ($dir, $base) = ($cmd->[0] =~ m!\A(.+)/([^/]+)\z!);
- $path = "$dir:$path";
- $cmd->[0] = $base;
- }
- local $ENV{PATH} = $path;
- eval { PublicInbox::Import::run_die($cmd, undef, $rdr) };
- isnt($@, '', $msg);
+ my $err = '';
+ ok(!run_script($cmd, undef, { 2 => \$err, 1 => \$err }), $msg);
}
{
local $ENV{PI_DIR} = "$tmpdir/.public-inbox/";
my $cfgfile = "$ENV{PI_DIR}/config";
- my @cmd = (pi_init, 'blist', "$tmpdir/blist",
- qw(http://example.com/blist blist@example.com));
- is(system(@cmd), 0, 'public-inbox-init OK');
+ my $cmd = [ '-init', 'blist', "$tmpdir/blist",
+ qw(http://example.com/blist blist@example.com) ];
+ ok(run_script($cmd), 'public-inbox-init OK');
is(read_indexlevel('blist'), '', 'indexlevel unset by default');
ok(-e $cfgfile, "config exists, now");
- is(system(@cmd), 0, 'public-inbox-init OK (idempotent)');
+ ok(run_script($cmd), 'public-inbox-init OK (idempotent)');
chmod 0666, $cfgfile or die "chmod failed: $!";
- @cmd = (pi_init, 'clist', "$tmpdir/clist",
- qw(http://example.com/clist clist@example.com));
- is(system(@cmd), 0, 'public-inbox-init clist OK');
+ $cmd = [ '-init', 'clist', "$tmpdir/clist",
+ qw(http://example.com/clist clist@example.com)];
+ ok(run_script($cmd), 'public-inbox-init clist OK');
is((stat($cfgfile))[2] & 07777, 0666, "permissions preserved");
- @cmd = (pi_init, 'clist', '-V2', "$tmpdir/clist",
- qw(http://example.com/clist clist@example.com));
- quiet_fail(\@cmd, 'attempting to init V2 from V1 fails');
+ $cmd = [ '-init', 'clist', '-V2', "$tmpdir/clist",
+ qw(http://example.com/clist clist@example.com) ];
+ quiet_fail($cmd, 'attempting to init V2 from V1 fails');
+ ok(!-e "$cfgfile.lock", 'no lock leftover after init');
open my $lock, '+>', "$cfgfile.lock" or die;
- @cmd = (getcwd(). '/'. pi_init, 'lock', "$tmpdir/lock",
- qw(http://example.com/lock lock@example.com));
+ $cmd = [ '-init', 'lock', "$tmpdir/lock",
+ qw(http://example.com/lock lock@example.com) ];
ok(-e "$cfgfile.lock", 'lock exists');
- my $pid = spawn(\@cmd, undef, $rdr);
- is(waitpid($pid, 0), $pid, 'lock init failed');
+
+ # this calls exit():
+ my $err = '';
+ ok(!run_script($cmd, undef, {2 => \$err}), 'lock init failed');
is($? >> 8, 255, 'got expected exit code on lock failure');
ok(unlink("$cfgfile.lock"),
'-init did not unlink lock on failure');
@@ -69,44 +58,44 @@ SKIP: {
require_git(2.6, 1) or skip "git 2.6+ required", 2;
local $ENV{PI_DIR} = "$tmpdir/.public-inbox/";
my $cfgfile = "$ENV{PI_DIR}/config";
- my @cmd = (pi_init, '-V2', 'v2list', "$tmpdir/v2list",
- qw(http://example.com/v2list v2list@example.com));
- is(system(@cmd), 0, 'public-inbox-init -V2 OK');
+ my $cmd = [ '-init', '-V2', 'v2list', "$tmpdir/v2list",
+ qw(http://example.com/v2list v2list@example.com) ];
+ ok(run_script($cmd), 'public-inbox-init -V2 OK');
ok(-d "$tmpdir/v2list", 'v2list directory exists');
ok(-f "$tmpdir/v2list/msgmap.sqlite3", 'msgmap exists');
ok(-d "$tmpdir/v2list/all.git", 'catch-all.git directory exists');
- @cmd = (pi_init, 'v2list', "$tmpdir/v2list",
- qw(http://example.com/v2list v2list@example.com));
- is(system(@cmd), 0, 'public-inbox-init is idempotent');
+ $cmd = [ '-init', 'v2list', "$tmpdir/v2list",
+ qw(http://example.com/v2list v2list@example.com) ];
+ ok(run_script($cmd), 'public-inbox-init is idempotent');
ok(! -d "$tmpdir/public-inbox" && !-d "$tmpdir/objects",
'idempotent invocation w/o -V2 does not make inbox v1');
is(read_indexlevel('v2list'), '', 'indexlevel unset by default');
- @cmd = (pi_init, 'v2list', "-V1", "$tmpdir/v2list",
- qw(http://example.com/v2list v2list@example.com));
- quiet_fail(\@cmd, 'initializing V2 as V1 fails');
+ $cmd = [ '-init', 'v2list', "-V1", "$tmpdir/v2list",
+ qw(http://example.com/v2list v2list@example.com) ];
+ quiet_fail($cmd, 'initializing V2 as V1 fails');
foreach my $lvl (qw(medium basic)) {
- @cmd = (pi_init, "v2$lvl", '-V2', '-L', $lvl,
+ $cmd = [ '-init', "v2$lvl", '-V2', '-L', $lvl,
"$tmpdir/v2$lvl", "http://example.com/v2$lvl",
- "v2$lvl\@example.com");
- is(system(@cmd), 0, "-init -L $lvl");
+ "v2$lvl\@example.com" ];
+ ok(run_script($cmd), "-init -L $lvl");
is(read_indexlevel("v2$lvl"), $lvl, "indexlevel set to '$lvl'");
}
# loop for idempotency
for (1..2) {
- @cmd = (pi_init, '-V2', '-S1', 'skip1', "$tmpdir/skip1",
- qw(http://example.com/skip1 skip1@example.com));
- is(system(@cmd), 0, "--skip-epoch 1");
+ $cmd = [ '-init', '-V2', '-S1', 'skip1', "$tmpdir/skip1",
+ qw(http://example.com/skip1 skip1@example.com) ];
+ ok(run_script($cmd), "--skip-epoch 1");
my $gits = [ glob("$tmpdir/skip1/git/*.git") ];
is_deeply($gits, ["$tmpdir/skip1/git/1.git"], 'skip OK');
}
- @cmd = (pi_init, '-V2', '--skip-epoch=2', 'skip2', "$tmpdir/skip2",
- qw(http://example.com/skip2 skip2@example.com));
- is(system(@cmd), 0, "--skip-epoch 2");
+ $cmd = [ '-init', '-V2', '--skip-epoch=2', 'skip2', "$tmpdir/skip2",
+ qw(http://example.com/skip2 skip2@example.com) ];
+ ok(run_script($cmd), "--skip-epoch 2");
my $gits = [ glob("$tmpdir/skip2/git/*.git") ];
is_deeply($gits, ["$tmpdir/skip2/git/2.git"], 'skipping 2 works, too');
}
next prev parent reply other threads:[~2019-11-15 9:51 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-15 9:50 [PATCH 00/29] speed up tests by preloading Eric Wong
2019-11-15 9:50 ` [PATCH 01/29] edit: pass global variables into subs Eric Wong
2019-11-15 9:50 ` [PATCH 02/29] edit: use OO API of File::Temp to shorten lifetime Eric Wong
2019-11-15 9:50 ` [PATCH 03/29] admin: get rid of singleton $CFG var Eric Wong
2019-11-15 9:50 ` [PATCH 04/29] index: pass global variables into subs Eric Wong
2019-11-15 9:50 ` [PATCH 05/29] init: " Eric Wong
2019-11-15 9:50 ` [PATCH 06/29] mda: " Eric Wong
2019-11-15 9:50 ` [PATCH 07/29] learn: " Eric Wong
2019-11-15 9:50 ` [PATCH 08/29] inboxwritable: add ->cleanup method Eric Wong
2019-11-15 9:50 ` [PATCH 09/29] import: only pass Inbox object to SearchIdx->new Eric Wong
2019-11-15 9:50 ` [PATCH 10/29] xapcmd: do not fire END and DESTROY handlers in child Eric Wong
2019-11-15 9:50 ` [PATCH 11/29] spawn: which: allow embedded slash for relative path Eric Wong
2019-11-15 9:50 ` [PATCH 12/29] t/common: introduce run_script wrapper for t/cgi.t Eric Wong
2019-11-15 9:50 ` [PATCH 13/29] t/edit: switch to use run_script Eric Wong
2019-11-15 9:50 ` Eric Wong [this message]
2019-11-15 9:50 ` [PATCH 15/29] t/purge: convert to run_script Eric Wong
2019-11-15 9:50 ` [PATCH 16/29] t/v2mirror: get rid of IPC::Run dependency Eric Wong
2019-11-15 9:50 ` [PATCH 17/29] t/mda: switch to run_script for testing Eric Wong
2019-11-15 9:50 ` [PATCH 18/29] t/mda_filter_rubylang: drop IPC::Run dependency Eric Wong
2019-11-15 9:50 ` [PATCH 19/29] doc: remove IPC::Run as a dev and test dependency Eric Wong
2019-11-15 9:50 ` [PATCH 20/29] t/v2mirror: switch to default run_mode for speedup Eric Wong
2019-11-15 9:50 ` [PATCH 21/29] t/convert-compact: convert to run_script Eric Wong
2019-11-15 9:50 ` [PATCH 22/29] t/httpd: use run_script for -init Eric Wong
2019-11-15 9:50 ` [PATCH 23/29] t/watch_maildir_v2: " Eric Wong
2019-11-15 9:50 ` [PATCH 24/29] t/nntpd: " Eric Wong
2019-11-15 9:50 ` [PATCH 25/29] t/watch_filter_rubylang: run_script for -init and -index Eric Wong
2019-11-15 9:50 ` [PATCH 26/29] t/v2mda: switch to run_script in many places Eric Wong
2019-11-15 9:50 ` [PATCH 27/29] t/indexlevels-mirror*: switch to run_script Eric Wong
2019-11-15 9:50 ` [PATCH 28/29] t/xcpdb-reshard: use run_script for -xcpdb Eric Wong
2019-11-15 9:51 ` [PATCH 29/29] t/common: start_script replaces spawn_listener Eric Wong
2019-11-16 6:52 ` Eric Wong
2019-11-16 11:43 ` Eric Wong
2019-11-24 0:22 ` [PATCH 00/17] test fixes and cleanups Eric Wong
2019-11-24 0:22 ` [PATCH 01/17] tests: disable daemon workers in a few more places Eric Wong
2019-11-24 0:22 ` [PATCH 02/17] tests: use strict everywhere Eric Wong
2019-11-24 0:22 ` [PATCH 03/17] t/v1-add-remove-add: quiet down "git init" Eric Wong
2019-11-24 0:22 ` [PATCH 04/17] t/xcpdb-reshard: test xcpdb --compact Eric Wong
2019-11-24 0:22 ` [PATCH 05/17] t/httpd-corner: wait for worker process death Eric Wong
2019-11-24 0:22 ` [PATCH 06/17] t/nntpd-tls: sometimes SSL_connect succeeds quickly Eric Wong
2019-11-24 0:22 ` [PATCH 07/17] .gitignore: ignore local prove(1) files Eric Wong
2019-11-24 0:22 ` [PATCH 08/17] daemon: use sigprocmask to block signals at startup Eric Wong
2019-11-24 0:22 ` [PATCH 09/17] daemon: use sigprocmask when respawning workers Eric Wong
2019-11-24 0:22 ` [PATCH 10/17] daemon: avoid race when quitting workers Eric Wong
2019-11-25 8:59 ` Eric Wong
2019-11-27 1:33 ` [PATCH 0/2] fix kqueue support and missed signal wakeups Eric Wong
2019-11-27 1:33 ` [PATCH 1/2] dskqxs: fix missing EV_DISPATCH define Eric Wong
2019-11-27 1:33 ` [PATCH 2/2] httpd|nntpd: avoid missed signal wakeups Eric Wong
2019-11-24 0:22 ` [PATCH 11/17] t/common: start_script replaces spawn_listener Eric Wong
2019-11-24 0:22 ` [PATCH 12/17] t/nntpd-validate: get rid of threads dependency Eric Wong
2019-11-24 0:22 ` [PATCH 13/17] xapcmd: replace Xtmpdirs with File::Temp->newdir Eric Wong
2019-11-24 0:22 ` [PATCH 14/17] tests: use File::Temp->newdir instead of tempdir() Eric Wong
2019-11-24 0:22 ` [PATCH 15/17] tests: quiet down commit graph Eric Wong
2019-11-24 0:22 ` [PATCH 16/17] t/perf-*.t: use $ENV{GIANT_INBOX_DIR} consistently Eric Wong
2019-11-24 0:22 ` [PATCH 17/17] tests: move giant inbox/git dependent tests to xt/ 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=20191115095100.25633-15-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).