t/feed.t: make IPC::Run usage optional

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

diff --git a/t/feed.t b/t/feed.t
index 906552e5b853458bc839be7667b65a7aa76b4fd3..26c4bce35ea81a91c4bb29f72d9c8b055a1fd75b 100644 (file)
--- a/t/feed.t
+++ b/t/feed.t
@@ -8,7 +8,6 @@ use PublicInbox::Feed;
 use PublicInbox::Git;
 use PublicInbox::Import;
 use PublicInbox::Config;
-use IPC::Run qw/run/;
 use File::Temp qw/tempdir/;
 my $have_xml_feed = eval { require XML::Feed; 1 };
 require 't/common.perl';
@@ -22,6 +21,8 @@ sub string_feed {
 my %SSOMA;
 sub rand_use ($) {
        return 0 if $ENV{FAST};
+       eval { require IPC::Run };
+       return 0 if $@;
        my $cmd = $_[0];
        my $x = $SSOMA{$cmd};
        unless ($x) {
@@ -33,7 +34,8 @@ sub rand_use ($) {
                }
                $SSOMA{$cmd} = $x;
        }
-       (($x > 0 && (int(rand(10)) % 2) == 1) || $x < 0);
+       return if $x < 0;
+       ($x > 0 && (int(rand(10)) % 2) == 1);
 }
 
 my $tmpdir = tempdir('pi-feed-XXXXXX', TMPDIR => 1, CLEANUP => 1);
@@ -79,7 +81,7 @@ EOF
                if (rand_use('ssoma-mda')) {
                        $im->done;
                        my $str = $mime->as_string;
-                       run(['ssoma-mda', $git_dir], \$str) or
+                       IPC::Run::run(['ssoma-mda', $git_dir], \$str) or
                                die "mda failed: $?\n";
                } else {
                        like($im->add($mime), qr/\A:\d+/, 'added');
@@ -122,14 +124,9 @@ Date: Thu, 01 Jan 1970 00:00:00 +0000
 
 EOF
                if (rand_use('ssoma-mda')) {
-                       my $pid = open(my $pipe, "|-");
-                       defined $pid or die "fork/pipe failed: $!";
-                       if ($pid == 0) {
-                               exec("ssoma-mda", $git_dir);
-                       }
-
-                       print $pipe $spam->as_string or die "print failed: $!";
-                       close $pipe or die "close pipe failed: $!";
+                       my $str = $spam->as_string;
+                       IPC::Run::run(['ssoma-mda', $git_dir], \$str) or
+                               die "mda failed: $?\n";
                } else {
                        $im->add($spam);
                        $im->done;
@@ -154,7 +151,7 @@ EOF
        # nuke spam
        if (rand_use('ssoma-rm')) {
                my $spam_str = $spam->as_string;
-               run(["ssoma-rm", $git_dir], \$spam_str) or
+               IPC::Run::run(["ssoma-rm", $git_dir], \$spam_str) or
                                die "ssoma-rm failed: $?\n";
        } else {
                $im->remove($spam);
@@ -183,7 +180,7 @@ EOF
                my $feed = string_feed({
                        git_dir => $git_dir,
                        max => 3,
-                       listname => 'asdf',
+                       inbox => 'asdf',
                        pi_config => bless({
                                'publicinbox.asdf.address' => $addr,
                        }, 'PublicInbox::Config'),