X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Ffeed.t;h=ec8a5a42e9ae3ee635a6f592e64e8789efd66bfb;hb=55b707d788ce13696e4411389583e720ea6dab01;hp=61f0dc724328931da52daacac90b2ac8fd7362a0;hpb=e631b6bd914d8fb6826f1d8f8352785e53961048;p=public-inbox.git

diff --git a/t/feed.t b/t/feed.t
index 61f0dc72..ec8a5a42 100644
--- a/t/feed.t
+++ b/t/feed.t
@@ -1,46 +1,37 @@
-# Copyright (C) 2014-2015 all contributors <meta@public-inbox.org>
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# 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;
 use Test::More;
 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/;
+use PublicInbox::Inbox;
 my $have_xml_feed = eval { require XML::Feed; 1 };
-require 't/common.perl';
+use PublicInbox::TestCommon;
 
 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};
-	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;
+	my $res = PublicInbox::Feed::generate($_[0]);
+	my $body = $res->[2];
+	my $str = '';
+	while (defined(my $chunk = $body->getline)) {
+		$str .= $chunk;
 	}
-	return if $x < 0;
-	($x > 0 && (int(rand(10)) % 2) == 1);
+	$body->close;
+	$str;
 }
 
-my $tmpdir = tempdir('pi-feed-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($tmpdir, $for_destroy) = tmpdir();
 my $git_dir = "$tmpdir/gittest";
-my $git = PublicInbox::Git->new($git_dir);
-my $im = PublicInbox::Import->new($git, 'testbox', 'test@example');
+my $ibx = PublicInbox::Inbox->new({
+	address => 'test@example',
+	name => 'testbox',
+	inboxdir => $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");
@@ -77,14 +68,7 @@ msg $i
 
 keep me
 EOF
-		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');
-		}
+		like($im->add($mime), qr/\A:\d+/, 'added');
 	}
 	$im->done;
 }
@@ -93,16 +77,13 @@ EOF
 {
 	# 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");
 		}
 
@@ -122,27 +103,13 @@ Subject: SPAM!!!!!!!!
 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: $!";
-		} else {
-			$im->add($spam);
-			$im->done;
-		}
+		$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);
@@ -153,21 +120,12 @@ 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;
-	}
+	$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);
@@ -178,26 +136,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();