X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Ffeed.t;h=5ad90a07c1c8c1bd0f346f661b7170567f473965;hb=refs%2Ftags%2Fv1.6.1;hp=26c4bce35ea81a91c4bb29f72d9c8b055a1fd75b;hpb=814b92ef13959e6741bff2b6426d8a8c1d45fedd;p=public-inbox.git diff --git a/t/feed.t b/t/feed.t index 26c4bce3..5ad90a07 100644 --- a/t/feed.t +++ b/t/feed.t @@ -1,54 +1,42 @@ -# Copyright (C) 2014-2015 all contributors -# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt) +# Copyright (C) 2014-2020 all contributors +# License: AGPL-3.0+ use strict; use warnings; use Test::More; -use Email::MIME; +use PublicInbox::Eml; use PublicInbox::Feed; -use PublicInbox::Git; use PublicInbox::Import; -use PublicInbox::Config; -use File::Temp qw/tempdir/; -my $have_xml_feed = eval { require XML::Feed; 1 }; -require 't/common.perl'; +use PublicInbox::Inbox; +my $have_xml_treepp = eval { require XML::TreePP; 1 }; +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}; - 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; + 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"); - local $ENV{GIT_DIR} = $git_dir; - + $im->init_bare; foreach my $i (1..6) { - my $mime = Email::MIME->new(<new(< To: U Message-Id: <$i\@example.com> @@ -78,14 +66,7 @@ msg $i keep me EOF - 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'); - } + like($im->add($mime), qr/\A:\d+/, 'added'); } $im->done; } @@ -94,17 +75,16 @@ 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', - "id is set to default"); + skip 'XML::TreePP missing', 3 unless $have_xml_treepp; + my $t = XML::TreePP->new->parse($feed); + like($t->{feed}->{-xmlns}, qr/\bAtom\b/, + 'looks like an an Atom feed'); + is(scalar @{$t->{feed}->{entry}}, 3, + 'parsed three entries'); + is($t->{feed}->{id}, 'mailto:test@example', + 'id is set to default'); } like($feed, qr/drop me/, "long quoted text kept"); @@ -115,7 +95,7 @@ EOF # add a new spam message my $spam; { - $spam = Email::MIME->new(<new(< To: U Message-Id: @@ -123,77 +103,41 @@ Subject: SPAM!!!!!!!! Date: Thu, 01 Jan 1970 00:00:00 +0000 EOF - 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; - } + $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); - is($p->format, "Atom", "parsed atom feed"); - is(scalar $p->entries, 3, "parsed three entries"); + skip 'XML::TreePP missing', 2 unless $have_xml_treepp; + my $t = XML::TreePP->new->parse($spammy_feed); + like($t->{feed}->{-xmlns}, qr/\bAtom\b/, + 'looks like an an Atom feed'); + is(scalar @{$t->{feed}->{entry}}, 3, + 'parsed three entries'); } like($spammy_feed, qr/SPAM/s, "spam showed up :<"); } # nuke spam - 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; - } + $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); - is($p->format, "Atom", "parsed atom feed"); - is(scalar $p->entries, 3, "parsed three entries"); + skip 'XML::TreePP missing', 2 unless $have_xml_treepp; + my $t = XML::TreePP->new->parse($feed); + like($t->{feed}->{-xmlns}, qr/\bAtom\b/, + 'looks like an an Atom feed'); + is(scalar @{$t->{feed}->{entry}}, 3, + 'parsed three entries'); } unlike($feed, qr/SPAM/, "spam gone :>"); } } -# check pi_config -{ - foreach my $addr (('a@example.com'), ['a@example.com','b@localhost']) { - my $feed = string_feed({ - git_dir => $git_dir, - max => 3, - inbox => '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();