t/feed.t: remove ssoma use

No need to waste cycles with this anymore.

1 files changed, 6 insertions, 47 deletions

diff --git a/t/feed.t b/t/feed.t
index 8f19352f..4a887b49 100644
--- a/t/feed.t
+++ b/t/feed.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
@@ -17,28 +17,6 @@ sub string_feed {
         stream_to_string(PublicInbox::Feed::generate($_[0]));
 }
 
-# ensure we are compatible with existing ssoma installations which
-# do not use fast-import.  We can probably remove this in 2018
-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) {
-                $x = -1;
-                foreach my $p (split(':', $ENV{PATH})) {
-                        -x "$p/$cmd" or next;
-                        $x = 1;
-                        last;
-                }
-                $SSOMA{$cmd} = $x;
-        }
-        return if $x < 0;
-        ($x > 0 && (int(rand(10)) % 2) == 1);
-}
-
 my $tmpdir = tempdir('pi-feed-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 my $git_dir = "$tmpdir/gittest";
 my $ibx = PublicInbox::Inbox->new({
@@ -86,14 +64,7 @@ msg $i
 
 keep me
 EOF
-                if (rand_use('ssoma-mda')) {
-                        $im->done;
-                        my $str = $mime->as_string;
-                        IPC::Run::run(['ssoma-mda', $git_dir], \$str) or
-                                die "mda failed: $?\n";
-                } else {
-                        like($im->add($mime), qr/\A:\d+/, 'added');
-                }
+                like($im->add($mime), qr/\A:\d+/, 'added');
         }
         $im->done;
 }
@@ -128,14 +99,8 @@ Subject: SPAM!!!!!!!!
 Date: Thu, 01 Jan 1970 00:00:00 +0000
 
 EOF
-                if (rand_use('ssoma-mda')) {
-                        my $str = $spam->as_string;
-                        IPC::Run::run(['ssoma-mda', $git_dir], \$str) or
-                                die "mda failed: $?\n";
-                } else {
-                        $im->add($spam);
-                        $im->done;
-                }
+                $im->add($spam);
+                $im->done;
         }
 
         # check spam shows up
@@ -151,14 +116,8 @@ EOF
         }
 
         # nuke spam
-        if (rand_use('ssoma-rm')) {
-                my $spam_str = $spam->as_string;
-                IPC::Run::run(["ssoma-rm", $git_dir], \$spam_str) or
-                                die "ssoma-rm failed: $?\n";
-        } else {
-                $im->remove($spam);
-                $im->done;
-        }
+        $im->remove($spam);
+        $im->done;
 
         # spam no longer shows up
         {