X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Ffeed.t;h=cc5ae277f7c1e397b59e98429aff85c87badfc50;hb=80690e594710f2fb89d306f1f5faf4a57aea79c8;hp=8f19352fdbc273383573ddaae11f5f66c1ddbf9a;hpb=3d41aa23f35501ca92aab8aa42980fa73f7fa74f;p=public-inbox.git
diff --git a/t/feed.t b/t/feed.t
index 8f19352f..cc5ae277 100644
--- a/t/feed.t
+++ b/t/feed.t
@@ -1,83 +1,38 @@
-# Copyright (C) 2014-2018 all contributors
+#!perl -w
+# Copyright (C) 2014-2021 all contributors
# License: AGPL-3.0+
use strict;
-use warnings;
-use Test::More;
-use Email::MIME;
+use v5.10.1;
+use PublicInbox::TestCommon;
+use PublicInbox::Eml;
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 $have_xml_treepp = eval { require XML::TreePP; 1 };
+my ($tmpdir, $for_destroy) = tmpdir();
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 $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;
-
+my $ibx = create_inbox 'v1', tmpdir => $git_dir, sub {
+ my ($im, $ibx) = @_;
foreach my $i (1..6) {
- my $mime = Email::MIME->new(<add(PublicInbox::Eml->new(<
To: U
Message-Id: <$i\@example.com>
Subject: zzz #$i
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
+> drop me
msg $i
@@ -86,30 +41,27 @@ 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');
- }
}
- $im->done;
-}
+};
+
+$ibx->{url} = [ 'http://example.com/test' ];
+$ibx->{feedmax} = 3;
+my $im = $ibx->importer(0);
# spam check
{
# check initial feed
{
- my $feed = string_feed({ -inbox => $ibx });
+ my $feed = string_feed({ ibx => $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");
+ 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:v1@example.com',
+ 'id is set to default');
}
like($feed, qr/drop me/, "long quoted text kept");
@@ -120,7 +72,7 @@ EOF
# add a new spam message
my $spam;
{
- $spam = Email::MIME->new(<new(<
To: U
Message-Id:
@@ -128,49 +80,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({ -inbox => $ibx });
+ my $spammy_feed = string_feed({ ibx => $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({ -inbox => $ibx });
+ my $feed = string_feed({ ibx => $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 :>");
}
}
-done_testing();
+done_testing;