X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fnntp.t;h=5bad9dfe25fe204d5a998185b7546d0b8a580329;hb=41c3eed65eb03256b0916cfdbf43723e070a633a;hp=961b3d6af1e2da8b29aa3aec6cb1bb86e228d11a;hpb=57c2bb80e2f94dfcbf08532f72c7ed568ceef7be;p=public-inbox.git
diff --git a/t/nntp.t b/t/nntp.t
index 961b3d6a..5bad9dfe 100644
--- a/t/nntp.t
+++ b/t/nntp.t
@@ -1,12 +1,14 @@
-# Copyright (C) 2015-2019 all contributors
+# Copyright (C) 2015-2021 all contributors
# License: AGPL-3.0+
use strict;
use warnings;
use Test::More;
use PublicInbox::TestCommon;
+use PublicInbox::Eml;
require_mods(qw(DBD::SQLite Data::Dumper));
use_ok 'PublicInbox::NNTP';
use_ok 'PublicInbox::Inbox';
+use PublicInbox::Config;
{
sub quote_str {
@@ -68,7 +70,7 @@ use_ok 'PublicInbox::Inbox';
my ($date, $time, $gmt) = @_;
my $m = join(' ', @_);
my $ts = PublicInbox::NNTP::parse_time(@_);
- my @t = gmtime($ts);
+ my @t = $gmt ? gmtime($ts) : localtime($ts);
my ($d, $t) = split(' ', strftime('%Y%m%d %H%M%S', @t));
if (length($date) != 8) { # Net::NNTP uses YYMMDD :<
$d =~ s/^[0-9]{2}//;
@@ -96,42 +98,39 @@ use_ok 'PublicInbox::Inbox';
}
{ # test setting NNTP headers in HEAD and ARTICLE requests
- require Email::MIME;
my $u = 'https://example.com/a/';
- my $ng = PublicInbox::Inbox->new({ name => 'test',
+ my $ibx = PublicInbox::Inbox->new({ name => 'test',
inboxdir => 'test.git',
address => 'a@example.com',
-primary_address => 'a@example.com',
newsgroup => 'test',
domain => 'example.com',
- url => '//example.com/a'});
- is($ng->base_url, $u, 'URL expanded');
+ url => [ '//example.com/a' ]});
+ is($ibx->base_url, $u, 'URL expanded');
my $mid = 'a@b';
- my $mime = Email::MIME->new("Message-ID: <$mid>\r\n\r\n");
+ my $mime = PublicInbox::Eml->new("Message-ID: <$mid>\r\n\r\n");
my $hdr = $mime->header_obj;
- my $mock_self = { nntpd => { grouplist => [],
- servername => 'example.com' } };
- PublicInbox::NNTP::set_nntp_headers($mock_self, $hdr, $ng, 1, $mid);
+ my $mock_self = {
+ nntpd => {
+ servername => 'example.com',
+ pi_cfg => bless {}, 'PublicInbox::Config',
+ },
+ ibx => $ibx,
+ };
+ my $smsg = { num => 1, mid => $mid, nntp => $mock_self, -ibx => $ibx };
+ PublicInbox::NNTP::set_nntp_headers($hdr, $smsg);
is_deeply([ $mime->header('Message-ID') ], [ "<$mid>" ],
'Message-ID unchanged');
- is_deeply([ $mime->header('Archived-At') ], [ "<${u}a\@b/>" ],
- 'Archived-At: set');
- is_deeply([ $mime->header('List-Archive') ], [ "<$u>" ],
- 'List-Archive: set');
- is_deeply([ $mime->header('List-Post') ], [ '' ],
- 'List-Post: set');
is_deeply([ $mime->header('Newsgroups') ], [ 'test' ],
'Newsgroups: set');
is_deeply([ $mime->header('Xref') ], [ 'example.com test:1' ],
'Xref: set');
- $ng->{-base_url} = 'http://mirror.example.com/m/';
- PublicInbox::NNTP::set_nntp_headers($mock_self, $hdr, $ng, 2, $mid);
+ $ibx->{-base_url} = 'http://mirror.example.com/m/';
+ $smsg->{num} = 2;
+ PublicInbox::NNTP::set_nntp_headers($hdr, $smsg);
is_deeply([ $mime->header('Message-ID') ], [ "<$mid>" ],
'Message-ID unchanged');
- is_deeply([ $mime->header('Archived-At') ],
- [ "<${u}a\@b/>", '' ],
- 'Archived-At: appended');
is_deeply([ $mime->header('Xref') ], [ 'example.com test:2' ],
'Old Xref: clobbered');
}