X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Ffeed.t;h=7e1596b1cb153f4de322e23c94bc48941ddac4fd;hb=956ede734d7c2e8d0a3003c6e2d554114586643e;hp=63fcc443143f1f40e7e5463f5181da495c8fbc85;hpb=7c69497a0126cd613053d881d63586bead07dd0e;p=public-inbox.git diff --git a/t/feed.t b/t/feed.t index 63fcc443..7e1596b1 100644 --- a/t/feed.t +++ b/t/feed.t @@ -1,28 +1,62 @@ -# Copyright (C) 2014, Eric Wong and all contributors +# Copyright (C) 2014-2015 all contributors # 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 PublicInbox::Inbox; use File::Temp qw/tempdir/; my $have_xml_feed = eval { require XML::Feed; 1 }; +require './t/common.perl'; -my $tmpdir = tempdir(CLEANUP => 1); +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({ + 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 $pid = open(my $pipe, "|-"); - defined $pid or die "fork/pipe failed: $!\n"; - if ($pid == 0) { - exec("ssoma-mda", $git_dir); - } - - my $simple = Email::Simple->new(<new(< To: U Message-Id: <$i\@example.com> @@ -31,29 +65,54 @@ Date: Thu, 01 Jan 1970 00:00:00 +0000 > This is a long multi line quote so it should not be allowed to > show up in its entirty in the Atom feed. drop me +> I quote to much +> I quote to much +> I quote to much +> I quote to much +> I quote to much +> I quote to much +> I quote to much +> I quote to much +> I quote to much +> I quote to much +> I quote to much +> I quote to much +> I quote to much msg $i -> inline me here, short quote +> inline me here +> this is a short quote keep me EOF - print $pipe $simple->as_string or die "print failed: $!\n"; - close $pipe or die "close pipe 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 = PublicInbox::Feed->generate({ - git_dir => $git_dir, - max => 3 - }); - if ($have_xml_feed) { + 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:test@example', + "id is set to default"); } - unlike($feed, qr/drop me/, "long quoted text dropped"); + + 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"); } @@ -61,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(<new(< To: U Message-Id: @@ -75,17 +128,21 @@ 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 = PublicInbox::Feed->generate({ - git_dir => $git_dir, - max => 3 - }); - if ($have_xml_feed) { + my $spammy_feed = string_feed({ -inbox => $ibx }); + SKIP: { + skip 'XML::Feed missing', 2 unless $have_xml_feed; my $p = XML::Feed->parse(\$spammy_feed); is($p->format, "Atom", "parsed atom feed"); is(scalar $p->entries, 3, "parsed three entries"); @@ -94,23 +151,20 @@ EOF } # nuke spam - { - my $pid = open(my $pipe, "|-"); - defined $pid or die "fork/pipe failed: $!\n"; - if ($pid == 0) { - exec("ssoma-rm", $git_dir); - } - print $pipe $spam->as_string or die "print failed: $!\n"; - close $pipe or die "close pipe failed: $!\n"; + 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; } # spam no longer shows up { - my $feed = PublicInbox::Feed->generate({ - git_dir => $git_dir, - max => 3 - }); - if ($have_xml_feed) { + 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");