t/mda_filter_rubylang: drop IPC::Run dependency

[public-inbox.git] / t / v2mirror.t

diff --git a/t/v2mirror.t b/t/v2mirror.t
index c31dcd5bf7cdc2ed6c8df36ab89656eb70f8d7d2..3c23809321086f5bebc5816333ecc048003d4b21 100644 (file)
--- a/t/v2mirror.t
+++ b/t/v2mirror.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2018-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
@@ -8,8 +8,7 @@ require_git(2.6);
 
 # Integration tests for HTTP cloning + mirroring
 foreach my $mod (qw(Plack::Util Plack::Builder
-                       HTTP::Date HTTP::Status Search::Xapian DBD::SQLite
-                       IPC::Run)) {
+                       HTTP::Date HTTP::Status Search::Xapian DBD::SQLite)) {
        eval "require $mod";
        plan skip_all => "$mod missing for v2mirror.t" if $@;
 }
@@ -28,7 +27,7 @@ my $pi_config = "$tmpdir/config";
        open my $fh, '>', $pi_config or die "open($pi_config): $!";
        print $fh <<"" or die "print $pi_config: $!";
 [publicinbox "v2"]
-       mainrepo = $tmpdir/in
+       inboxdir = $tmpdir/in
        address = test\@example.com
 
        close $fh or die "close($pi_config): $!";
@@ -60,19 +59,14 @@ my $epoch_max = $v2w->{epoch_max};
 ok($epoch_max > 0, "multiple epochs");
 $v2w->done;
 
-my %opts = (
-       LocalAddr => '127.0.0.1',
-       ReuseAddr => 1,
-       Proto => 'tcp',
-       Listen => 1024,
-);
 my ($sock, $pid);
 END { kill 'TERM', $pid if defined $pid };
 
 $! = 0;
-$sock = IO::Socket::INET->new(%opts);
+$sock = tcp_server();
 ok($sock, 'sock created');
-my $cmd = [ "$script-httpd", "--stdout=$tmpdir/out", "--stderr=$tmpdir/err" ];
+my $httpd = "$script-httpd";
+my $cmd = [ $httpd, '-W0', "--stdout=$tmpdir/out", "--stderr=$tmpdir/err" ];
 ok(defined($pid = spawn_listener(undef, $cmd, [ $sock ])),
        'spawned httpd process successfully');
 my ($host, $port) = ($sock->sockhost, $sock->sockport);
@@ -89,12 +83,12 @@ foreach my $i (0..$epoch_max) {
        ok(-d "$tmpdir/m/git/$i.git", "mirror $i OK");
 }
 
-@cmd = ("$script-init", '-V2', 'm', "$tmpdir/m", 'http://example.com/m',
+@cmd = ("-init", '-V2', 'm', "$tmpdir/m", 'http://example.com/m',
        'alt@example.com');
-is(system(@cmd), 0, 'initialized public-inbox -V2');
-is(system("$script-index", "$tmpdir/m"), 0, 'indexed');
+ok(run_script(\@cmd, undef, {run_mode => 0}), 'initialized public-inbox -V2');
+ok(run_script(['-index', "$tmpdir/m"], undef, { run_mode => 0}), 'indexed');
 
-my $mibx = { mainrepo => "$tmpdir/m", address => 'alt@example.com' };
+my $mibx = { inboxdir => "$tmpdir/m", address => 'alt@example.com' };
 $mibx = PublicInbox::Inbox->new($mibx);
 is_deeply([$mibx->mm->minmax], [$ibx->mm->minmax], 'index synched minmax');
 
@@ -118,7 +112,7 @@ fetch_each_epoch();
 
 my $mset = $mibx->search->reopen->query('m:15@example.com', {mset => 1});
 is(scalar($mset->items), 0, 'new message not found in mirror, yet');
-is(system("$script-index", "$tmpdir/m"), 0, 'index updated');
+ok(run_script(["-index", "$tmpdir/m"], undef, {run_mode=>0}), 'index updated');
 is_deeply([$mibx->mm->minmax], [$ibx->mm->minmax], 'index synched minmax');
 $mset = $mibx->search->reopen->query('m:15@example.com', {mset => 1});
 is(scalar($mset->items), 1, 'found message in mirror');
@@ -146,9 +140,10 @@ is(scalar($mset->items), 0, 'purged message gone from origin');
 
 fetch_each_epoch();
 {
-       my $cmd = [ "$script-index", '--prune', "$tmpdir/m" ];
-       my ($in, $out, $err) = ('', '', '');
-       ok(IPC::Run::run($cmd, \$in, \$out, \$err), '-index --prune');
+       my $cmd = [ '-index', '--prune', "$tmpdir/m" ];
+       my ($out, $err) = ('', '');
+       my $opt = { 1 => \$out, 2 => \$err, run_mode => 0 };
+       ok(run_script($cmd, undef, $opt), '-index --prune');
        like($err, qr/discontiguous range/, 'warned about discontiguous range');
        unlike($err, qr/fatal/, 'no scary fatal error shown');
 }
@@ -179,9 +174,10 @@ is($mibx->git->check($to_purge), undef, 'unindex+prune successful in mirror');
        $v2w->done;
        fetch_each_epoch();
 
-       my ($in, $out, $err) = ('', '', '');
-       my $cmd = [ "$script-index", "$tmpdir/m" ];
-       ok(IPC::Run::run($cmd, \$in, \$out, \$err), 'index ran');
+       my $cmd = [ "-index", "$tmpdir/m" ];
+       my ($out, $err) = ('', '');
+       my $opt = { 1 => \$out, 2 => \$err, run_mode => 0 };
+       ok(run_script($cmd, undef, $opt), 'index ran');
        is($err, '', 'no errors reported by index');
        $mset = $mibx->search->reopen->query('m:1@example.com', {mset => 1});
        is(scalar($mset->items), 0, '1@example.com no longer visible in mirror');