imap: fix multi-message partial header fetches

[public-inbox.git] / t / imapd.t

diff --git a/t/imapd.t b/t/imapd.t
index a63be0fd0c2c63ba45a2448376485548658135c5..fcbbdc09d316d719755ab4b517a95d7ef3be99e3 100644 (file)
--- a/t/imapd.t
+++ b/t/imapd.t
@@ -1,6 +1,7 @@
 #!perl -w
 # Copyright (C) 2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+# end-to-end IMAP tests, see unit tests in t/imap.t, too
 use strict;
 use Test::More;
 use Time::HiRes ();
@@ -99,54 +100,6 @@ like($raw[0], qr/^\* LIST \(.*?\) "\." inbox/,
                'got an inbox.i1');
 like($raw[-1], qr/^\S+ OK /, 'response ended with OK');
 
-{ # make sure we get '%' globbing right
-       my @n = map { { newsgroup => $_ } } (qw(x.y.z x.z.y));
-       my $self = { imapd => { grouplist => \@n } };
-       PublicInbox::IMAPD::refresh_inboxlist($self->{imapd});
-       my $res = PublicInbox::IMAP::cmd_list($self, 'tag', 'x', '%');
-       is(scalar($$res =~ tr/\n/\n/), 2, 'only one result');
-       like($$res, qr/ x\r\ntag OK/, 'saw expected');
-       $res = PublicInbox::IMAP::cmd_list($self, 'tag', 'x.', '%');
-       is(scalar($$res =~ tr/\n/\n/), 3, 'only one result');
-       is(scalar(my @x = ($$res =~ m/ x\.[zy]\r\n/g)), 2, 'match expected');
-
-       $res = PublicInbox::IMAP::cmd_list($self, 't', 'x.(?{die "RCE"})', '%');
-       like($$res, qr/\At OK /, 'refname does not match attempted RCE');
-       $res = PublicInbox::IMAP::cmd_list($self, 't', '', '(?{die "RCE"})%');
-       like($$res, qr/\At OK /, 'wildcard does not match attempted RCE');
-}
-
-if ($ENV{TEST_BENCHMARK}) {
-       use Benchmark qw(:all);
-       my @n = map { { newsgroup => "inbox.comp.foo.bar.$_" } } (0..50000);
-       push @n, map { { newsgroup => "xobni.womp.foo.bar.$_" } } (0..50000);
-       my $self = { imapd => { grouplist => \@n } };
-       PublicInbox::IMAPD::refresh_inboxlist($self->{imapd});
-
-       my $n = scalar @n;
-       open my $null, '>', '/dev/null' or die;
-       my $ds = { sock => $null };
-       my $nr = 200;
-       diag "starting benchmark...";
-       my $t = timeit(1, sub {
-               for (0..$nr) {
-                       my $res = PublicInbox::IMAP::cmd_list($self, 'tag',
-                                                               '', '*');
-                       PublicInbox::DS::write($ds, $res);
-               }
-       });
-       diag timestr($t). "list all for $n inboxes $nr times";
-       $nr = 20;
-       $t = timeit(1, sub {
-               for (0..$nr) {
-                       my $res = PublicInbox::IMAP::cmd_list($self, 'tag',
-                                                               'inbox.', '%');
-                       PublicInbox::DS::write($ds, $res);
-               }
-       });
-       diag timestr($t). "list partial for $n inboxes $nr times";
-}
-
 my $ret = $mic->search('all') or BAIL_OUT "SEARCH FAIL $@";
 is_deeply($ret, [ 1 ], 'search all works');
 $ret = $mic->search('uid 1') or BAIL_OUT "SEARCH FAIL $@";
@@ -338,7 +291,7 @@ $pi_config->each_inbox(sub {
                 qr/done_testing;(?:\r\n){1,2}\z/,
                'BODY[2.1.2] tail matched');
 
-       $ret = $mic->fetch_hash($uidnext, 'BODY[2.HEADER]') or
+       $ret = $mic->fetch_hash("1:$uidnext", 'BODY[2.HEADER]') or
                                                BAIL_OUT "2.HEADER $@";
        like($ret->{$uidnext}->{'BODY[2.HEADER]'},
                qr/\ADate: Sat, 18 Apr 2020 22:20:20 /,