t/feed.t: run properly without ssoma installed

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

diff --git a/t/feed.t b/t/feed.t
index a9955f08ca6c0d567ab484add21e0b5e5cd157ad..61f0dc724328931da52daacac90b2ac8fd7362a0 100644 (file)
--- a/t/feed.t
+++ b/t/feed.t
@@ -1,10 +1,12 @@
-# Copyright (C) 2014, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2014-2015 all contributors <meta@public-inbox.org>
 # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
 use strict;
 use warnings;
 use Test::More;
-use Email::Simple;
+use Email::MIME;
 use PublicInbox::Feed;
+use PublicInbox::Git;
+use PublicInbox::Import;
 use PublicInbox::Config;
 use IPC::Run qw/run/;
 use File::Temp qw/tempdir/;
@@ -15,15 +17,37 @@ sub string_feed {
        stream_to_string(PublicInbox::Feed::generate($_[0]));
 }
 
-my $tmpdir = tempdir(CLEANUP => 1);
+# 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};
+       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 $git = PublicInbox::Git->new($git_dir);
+my $im = PublicInbox::Import->new($git, 'testbox', 'test@example');
 
 {
        is(0, system(qw(git init -q --bare), $git_dir), "git init");
        local $ENV{GIT_DIR} = $git_dir;
 
        foreach my $i (1..6) {
-               my $simple = Email::Simple->new(<<EOF);
+               my $mime = Email::MIME->new(<<EOF);
 From: ME <me\@example.com>
 To: U <u\@example.com>
 Message-Id: <$i\@example.com>
@@ -53,10 +77,16 @@ msg $i
 
 keep me
 EOF
-               my $str = $simple->as_string;
-               run(['ssoma-mda', $git_dir], \$str) or
-                       die "mda failed: $?\n";
+               if (rand_use('ssoma-mda')) {
+                       $im->done;
+                       my $str = $mime->as_string;
+                       run(['ssoma-mda', $git_dir], \$str) or
+                               die "mda failed: $?\n";
+               } else {
+                       like($im->add($mime), qr/\A:\d+/, 'added');
+               }
        }
+       $im->done;
 }
 
 # spam check
@@ -76,9 +106,7 @@ EOF
                                "id is set to default");
                }
 
-               unlike($feed, qr/drop me/, "long quoted text dropped");
-               like($feed, qr!/f/\d%40example\.com/#q!,
-                       "/f/ url generated for long quoted text");
+               like($feed, qr/drop me/, "long quoted text kept");
                like($feed, qr/inline me here/, "short quoted text kept");
                like($feed, qr/keep me/, "unquoted text saved");
        }
@@ -86,13 +114,7 @@ EOF
        # add a new spam message
        my $spam;
        {
-               my $pid = open(my $pipe, "|-");
-               defined $pid or die "fork/pipe failed: $!\n";
-               if ($pid == 0) {
-                       exec("ssoma-mda", $git_dir);
-               }
-
-               $spam = Email::Simple->new(<<EOF);
+               $spam = Email::MIME->new(<<EOF);
 From: SPAMMER <spammer\@example.com>
 To: U <u\@example.com>
 Message-Id: <this-is-spam\@example.com>
@@ -100,8 +122,19 @@ Subject: SPAM!!!!!!!!
 Date: Thu, 01 Jan 1970 00:00:00 +0000
 
 EOF
-               print $pipe $spam->as_string or die "print failed: $!\n";
-               close $pipe or die "close pipe failed: $!\n";
+               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: $!";
+               } else {
+                       $im->add($spam);
+                       $im->done;
+               }
        }
 
        # check spam shows up
@@ -120,10 +153,13 @@ EOF
        }
 
        # nuke spam
-       {
+       if (rand_use('ssoma-rm')) {
                my $spam_str = $spam->as_string;
                run(["ssoma-rm", $git_dir], \$spam_str) or
                                die "ssoma-rm failed: $?\n";
+       } else {
+               $im->remove($spam);
+               $im->done;
        }
 
        # spam no longer shows up