From 67fe4d8d90ac77419c8fc41457c849aa7d366a9d Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 19 Sep 2021 12:50:29 +0000 Subject: net_reader: fix single NNTP article fetch, test ranges While NNTP ranges was already working, fetching a single message was broken. We'll also simplify the code a bit and ensure incremental synchronization is ignored when ranges are specified. --- t/lei-import-nntp.t | 26 ++++++++++++++++++++++++++ t/uri_nntps.t | 3 +++ 2 files changed, 29 insertions(+) (limited to 't') diff --git a/t/lei-import-nntp.t b/t/lei-import-nntp.t index f2c35406..1eb41e0e 100644 --- a/t/lei-import-nntp.t +++ b/t/lei-import-nntp.t @@ -37,5 +37,31 @@ test_lei({ tmpdir => $tmpdir }, sub { ok(-s $f, 'mail_sync exists tracked for redundant imports'); lei_ok 'ls-mail-sync'; like($lei_out, qr!\A\Q$url\E\n\z!, 'ls-mail-sync output as-expected'); + + ok(!lei(qw(import), "$url/12-1"), 'backwards range rejected'); + + # new home + local $ENV{HOME} = "$tmpdir/h2"; + lei_ok(qw(ls-mail-source -l), $url); + my $ls = json_utf8->decode($lei_out); + my ($high, $low) = @{$ls->[0]}{qw(high low)}; + ok($high > $low, 'high > low'); + + my $end = $high - 1; + lei_ok qw(import), "$url/$high"; + lei_ok qw(q z:0..); my $one = json_utf8->decode($lei_out); + pop @$one; # trailing null + is(scalar(@$one), 1, 'only 1 result'); + + local $ENV{HOME} = "$tmpdir/h3"; + lei_ok qw(import), "$url/$low-$end"; + lei_ok qw(q z:0..); my $start = json_utf8->decode($lei_out); + pop @$start; # trailing null + is(scalar(@$start), scalar(map { $_ } ($low..$end)), + 'range worked as expected'); + my %seen; + for (@$start, @$one) { + is($seen{$_->{blob}}++, 0, "blob $_->{blob} seen once"); + } }); done_testing; diff --git a/t/uri_nntps.t b/t/uri_nntps.t index babd8088..6b123a9b 100644 --- a/t/uri_nntps.t +++ b/t/uri_nntps.t @@ -37,4 +37,7 @@ is(PublicInbox::URInntps->new('nntps://0:563/')->canonical->as_string, $uri = PublicInbox::URInntps->new('nntps://NSA:Hunter2@0/inbox'); is($uri->userinfo, 'NSA:Hunter2', 'userinfo accepted w/ pass'); +$uri = PublicInbox::URInntps->new('nntps://NSA:Hunter2@0/inbox.test/9-10'); +is_deeply([$uri->group], [ 'inbox.test', 9, 10 ], 'ranges work'); + done_testing; -- cgit v1.2.3-24-ge0c7