X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Ffeed.t;h=8f19352fdbc273383573ddaae11f5f66c1ddbf9a;hb=55b22e6414b78336633ca243c113c712af2c3bcd;hp=906552e5b853458bc839be7667b65a7aa76b4fd3;hpb=fe3d2447badd595df784541556311137b920b0a2;p=public-inbox.git

diff --git a/t/feed.t b/t/feed.t
index 906552e5..8f19352f 100644
--- a/t/feed.t
+++ b/t/feed.t
@@ -1,5 +1,5 @@
-# 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-2018 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;
@@ -8,10 +8,10 @@ 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';
+require './t/common.perl';
 
 sub string_feed {
 	stream_to_string(PublicInbox::Feed::generate($_[0]));
@@ -22,6 +22,8 @@ sub string_feed {
 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) {
@@ -33,13 +35,21 @@ sub rand_use ($) {
 		}
 		$SSOMA{$cmd} = $x;
 	}
-	(($x > 0 && (int(rand(10)) % 2) == 1) || $x < 0);
+	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');
+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");
@@ -79,7 +89,7 @@ EOF
 		if (rand_use('ssoma-mda')) {
 			$im->done;
 			my $str = $mime->as_string;
-			run(['ssoma-mda', $git_dir], \$str) or
+			IPC::Run::run(['ssoma-mda', $git_dir], \$str) or
 				die "mda failed: $?\n";
 		} else {
 			like($im->add($mime), qr/\A:\d+/, 'added');
@@ -92,16 +102,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,14 +129,9 @@ 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: $!";
+			my $str = $spam->as_string;
+			IPC::Run::run(['ssoma-mda', $git_dir], \$str) or
+				die "mda failed: $?\n";
 		} else {
 			$im->add($spam);
 			$im->done;
@@ -138,10 +140,7 @@ EOF
 
 	# 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);
@@ -154,7 +153,7 @@ 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);
@@ -163,10 +162,7 @@ EOF
 
 	# 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);
@@ -177,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();