From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] t/feed.t: remove ssoma use
Date: Wed, 2 Jan 2019 08:33:03 +0000 [thread overview]
Message-ID: <20190102083303.30419-1-e@80x24.org> (raw)
No need to waste cycles with this anymore.
---
t/feed.t | 53 ++++++-----------------------------------------------
1 file changed, 6 insertions(+), 47 deletions(-)
diff --git a/t/feed.t b/t/feed.t
index 8f19352..4a887b4 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
{
--
EW
reply other threads:[~2019-01-02 8:33 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20190102083303.30419-1-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).