X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fnntp.t;h=1db896cf46b5a6376929e8de6c501e28d8d0d6f0;hb=0e6ceff37fc38f28a1520d7475f31d47f74ec7e6;hp=938eef385bb5f2b12e3abccd5954d9db183c2f0c;hpb=1988d730c0088e8b1f6193650c7ee929df8a2ed7;p=public-inbox.git
diff --git a/t/nntp.t b/t/nntp.t
index 938eef38..1db896cf 100644
--- a/t/nntp.t
+++ b/t/nntp.t
@@ -1,9 +1,10 @@
-# Copyright (C) 2015-2019 all contributors
+# Copyright (C) 2015-2020 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';
@@ -68,7 +69,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,7 +97,6 @@ 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',
inboxdir => 'test.git',
@@ -107,11 +107,14 @@ use_ok 'PublicInbox::Inbox';
url => [ '//example.com/a' ]});
is($ng->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 => { grouplist => [], servername => 'example.com' },
+ ng => $ng,
+ };
+ my $smsg = { num => 1, mid => $mid };
+ PublicInbox::NNTP::set_nntp_headers($mock_self, $hdr, $smsg);
is_deeply([ $mime->header('Message-ID') ], [ "<$mid>" ],
'Message-ID unchanged');
is_deeply([ $mime->header('Archived-At') ], [ "<${u}a\@b/>" ],
@@ -126,7 +129,8 @@ use_ok 'PublicInbox::Inbox';
'Xref: set');
$ng->{-base_url} = 'http://mirror.example.com/m/';
- PublicInbox::NNTP::set_nntp_headers($mock_self, $hdr, $ng, 2, $mid);
+ $smsg->{num} = 2;
+ PublicInbox::NNTP::set_nntp_headers($mock_self, $hdr, $smsg);
is_deeply([ $mime->header('Message-ID') ], [ "<$mid>" ],
'Message-ID unchanged');
is_deeply([ $mime->header('Archived-At') ],