X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Ffeed.t;h=b60273ed53b313112f9ad175659a2936c3c454dd;hb=080ddbb0d3091282879a54515b5927801ee12952;hp=71cbb7356e7287b6b304330b70b15c6feec8b27c;hpb=f76f265a851944b5dedcc3be5f3b5224b6ebda89;p=public-inbox.git

diff --git a/t/feed.t b/t/feed.t
index 71cbb735..b60273ed 100644
--- a/t/feed.t
+++ b/t/feed.t
@@ -3,10 +3,12 @@
 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 PublicInbox::Inbox;
 use File::Temp qw/tempdir/;
 my $have_xml_feed = eval { require XML::Feed; 1 };
 require 't/common.perl';
@@ -15,15 +17,46 @@ 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};
+	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({
+	address => 'test@example',
+	name => 'testbox',
+	mainrepo => $git_dir,
+	url => 'http://example.com/test',
+	feedmax => 3,
+});
+my $git = $ibx->git;
+my $im = PublicInbox::Import->new($git, $ibx->{name}, '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,32 +86,33 @@ 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;
+			IPC::Run::run(['ssoma-mda', $git_dir], \$str) or
+				die "mda failed: $?\n";
+		} else {
+			like($im->add($mime), qr/\A:\d+/, 'added');
+		}
 	}
+	$im->done;
 }
 
 # spam check
 {
 	# check initial feed
 	{
-		my $feed = string_feed({
-			git_dir => $git_dir,
-			max => 3
-		});
+		my $feed = string_feed({ -inbox => $ibx });
 		SKIP: {
 			skip 'XML::Feed missing', 2 unless $have_xml_feed;
 			my $p = XML::Feed->parse(\$feed);
 			is($p->format, "Atom", "parsed atom feed");
 			is(scalar $p->entries, 3, "parsed three entries");
-			is($p->id, 'mailto:public-inbox@example.com',
+			is($p->id, 'mailto:test@example',
 				"id is set to default");
 		}
 
-		unlike($feed, qr/drop me/, "long quoted text dropped");
-		like($feed, qr!/\d%40example\.com/f/#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 +120,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,16 +128,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 $str = $spam->as_string;
+			IPC::Run::run(['ssoma-mda', $git_dir], \$str) or
+				die "mda failed: $?\n";
+		} else {
+			$im->add($spam);
+			$im->done;
+		}
 	}
 
 	# check spam shows up
 	{
-		my $spammy_feed = string_feed({
-			git_dir => $git_dir,
-			max => 3
-		});
+		my $spammy_feed = string_feed({ -inbox => $ibx });
 		SKIP: {
 			skip 'XML::Feed missing', 2 unless $have_xml_feed;
 			my $p = XML::Feed->parse(\$spammy_feed);
@@ -120,18 +151,18 @@ 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);
+		$im->done;
 	}
 
 	# spam no longer shows up
 	{
-		my $feed = string_feed({
-			git_dir => $git_dir,
-			max => 3
-		});
+		my $feed = string_feed({ -inbox => $ibx });
 		SKIP: {
 			skip 'XML::Feed missing', 2 unless $have_xml_feed;
 			my $p = XML::Feed->parse(\$feed);
@@ -142,26 +173,4 @@ EOF
 	}
 }
 
-# check pi_config
-{
-	foreach my $addr (('a@example.com'), ['a@example.com','b@localhost']) {
-		my $feed = string_feed({
-			git_dir => $git_dir,
-			max => 3,
-			listname => 'asdf',
-			pi_config => bless({
-				'publicinbox.asdf.address' => $addr,
-			}, 'PublicInbox::Config'),
-		});
-		SKIP: {
-			skip 'XML::Feed missing', 3 unless $have_xml_feed;
-			my $p = XML::Feed->parse(\$feed);
-			is($p->id, 'mailto:a@example.com',
-				"ID is set correctly");
-			is($p->format, "Atom", "parsed atom feed");
-			is(scalar $p->entries, 3, "parsed three entries");
-		}
-	}
-}
-
 done_testing();