From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 27/29] t/indexlevels-mirror*: switch to run_script
Date: Fri, 15 Nov 2019 09:50:58 +0000 [thread overview]
Message-ID: <20191115095100.25633-28-e@80x24.org> (raw)
In-Reply-To: <20191115095100.25633-1-e@80x24.org>
This more than doubles the speed of these tests
---
t/indexlevels-mirror.t | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/t/indexlevels-mirror.t b/t/indexlevels-mirror.t
index 40afe4e9..d129237e 100644
--- a/t/indexlevels-mirror.t
+++ b/t/indexlevels-mirror.t
@@ -17,9 +17,7 @@ foreach my $mod (qw(DBD::SQLite)) {
plan skip_all => "$mod missing for $0" if $@;
}
-my $path = 'blib/script';
-my $index = "$path/public-inbox-index";
-my @xcpdb = ("$path/public-inbox-xcpdb", '-q');
+my @xcpdb = qw(-xcpdb -q);
my $mime = PublicInbox::MIME->create(
header => [
@@ -48,7 +46,8 @@ sub import_index_incremental {
$im->done;
# index master (required for v1)
- is(system($index, $ibx->{inboxdir}, "-L$level"), 0, 'index master OK');
+ ok(run_script(['-index', $ibx->{inboxdir}, "-L$level"]),
+ 'index master OK');
my $ro_master = PublicInbox::Inbox->new({
inboxdir => $ibx->{inboxdir},
indexlevel => $level
@@ -70,13 +69,13 @@ sub import_index_incremental {
# inbox init
local $ENV{PI_CONFIG} = "$tmpdir/.picfg";
- @cmd = ("$path/public-inbox-init", '-L', $level,
+ @cmd = ('-init', '-L', $level,
'mirror', $mirror, '//example.com/test', 'test@example.com');
push @cmd, '-V2' if $v == 2;
- is(system(@cmd), 0, "v$v init OK");
+ ok(run_script(\@cmd), "v$v init OK");
# index mirror
- is(system($index, $mirror), 0, "v$v index mirror OK");
+ ok(run_script(['-index', $mirror]), "v$v index mirror OK");
# read-only access
my $ro_mirror = PublicInbox::Inbox->new({
@@ -94,14 +93,15 @@ sub import_index_incremental {
# mirror updates
is(system('git', "--git-dir=$fetch_dir", qw(fetch -q)), 0, 'fetch OK');
- is(system($index, $mirror), 0, "v$v index mirror again OK");
+ ok(run_script(['-index', $mirror]), "v$v index mirror again OK");
($nr, $msgs) = $ro_mirror->recent;
is($nr, 2, '2nd message seen in mirror');
is_deeply([sort { $a cmp $b } map { $_->{mid} } @$msgs],
['m@1','m@2'], 'got both messages in mirror');
# incremental index master (required for v1)
- is(system($index, $ibx->{inboxdir}, "-L$level"), 0, 'index master OK');
+ ok(run_script(['-index', $ibx->{inboxdir}, "-L$level"]),
+ 'index master OK');
($nr, $msgs) = $ro_master->recent;
is($nr, 2, '2nd message seen in master');
is_deeply([sort { $a cmp $b } map { $_->{mid} } @$msgs],
@@ -120,7 +120,7 @@ sub import_index_incremental {
is_deeply(\@rw_nums, [1], 'unindex NNTP article'.$v.$level);
if ($level ne 'basic') {
- is(system(@xcpdb, $mirror), 0, "v$v xcpdb OK");
+ ok(run_script([@xcpdb, $mirror]), "v$v xcpdb OK");
is(PublicInbox::Admin::detect_indexlevel($ro_mirror), $level,
'indexlevel detectable by Admin after xcpdb v' .$v.$level);
delete $ro_mirror->{$_} for (qw(over search));
@@ -130,7 +130,7 @@ sub import_index_incremental {
# sync the mirror
is(system('git', "--git-dir=$fetch_dir", qw(fetch -q)), 0, 'fetch OK');
- is(system($index, $mirror), 0, "v$v index mirror again OK");
+ ok(run_script(['-index', $mirror]), "v$v index mirror again OK");
($nr, $msgs) = $ro_mirror->recent;
is($nr, 1, '2nd message gone from mirror');
is_deeply([map { $_->{mid} } @$msgs], ['m@1'],
@@ -155,7 +155,7 @@ sub import_index_incremental {
}
$im->done;
is(system('git', "--git-dir=$fetch_dir", qw(fetch -q)), 0, 'fetch OK');
- is(system($index, '--reindex', $mirror), 0,
+ ok(run_script(['-index', '--reindex', $mirror]),
"v$v index --reindex mirror OK");
@ro_nums = map { $_->{num} } @{$ro_mirror->over->query_ts(0, 0)};
@rw_nums = map { $_->{num} } @{$ibx->over->query_ts(0, 0)};
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 ` [PATCH 14/29] t/init: convert to using run_script Eric Wong
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 ` Eric Wong [this message]
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-28-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).