tests: favor IPv6

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

diff --git a/t/imapd.t b/t/imapd.t
index f743bf06852176616b81f3825ee35e38d052f12a..0583dfdd138b5fa4a7dd92dc50132f00b14c1afe 100644 (file)
--- a/t/imapd.t
+++ b/t/imapd.t
@@ -1,5 +1,5 @@
 #!perl -w
-# Copyright (C) 2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2020-2021 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;
@@ -60,11 +60,8 @@ my $err = "$tmpdir/stderr.log";
 my $out = "$tmpdir/stdout.log";
 my $cmd = [ '-imapd', '-W0', "--stdout=$out", "--stderr=$err" ];
 my $td = start_script($cmd, undef, { 3 => $sock }) or BAIL_OUT("-imapd: $?");
-my %mic_opt = (
-       Server => $sock->sockhost,
-       Port => $sock->sockport,
-       Uid => 1,
-);
+my ($ihost, $iport) = tcp_host_port($sock);
+my %mic_opt = ( Server => $ihost, Port => $iport, Uid => 1 );
 my $mic = $imap_client->new(%mic_opt);
 my $pre_login_capa = $mic->capability;
 is(grep(/\AAUTH=ANONYMOUS\z/, @$pre_login_capa), 1,
@@ -251,8 +248,8 @@ ok($mic->logout, 'logout works');
 
 my $have_inotify = eval { require Linux::Inotify2; 1 };
 
-my $pi_config = PublicInbox::Config->new;
-$pi_config->each_inbox(sub {
+my $pi_cfg = PublicInbox::Config->new;
+$pi_cfg->each_inbox(sub {
        my ($ibx) = @_;
        my $env = { ORIGINAL_RECIPIENT => $ibx->{-primary_address} };
        my $name = $ibx->{name};
@@ -296,27 +293,11 @@ $pi_config->each_inbox(sub {
 
        # ensure IDLE persists across HUP, w/o extra watches or FDs
        $td->kill('HUP') or BAIL_OUT "failed to kill -imapd: $!";
-       SKIP: {
-               skip 'no inotify fdinfo (or support)', 2 if !@ino_info;
-               my (@tmp, %prev);
-               local $/ = "\n";
-               my $end = time + 5;
-               until (time > $end) {
-                       select undef, undef, undef, 0.01;
-                       open my $fh, '<', $ino_fdinfo or
-                                               BAIL_OUT "$ino_fdinfo: $!";
-                       %prev = map { $_ => 1 } @ino_info;
-                       @tmp = grep(/^inotify wd:/, <$fh>);
-                       if (scalar(@tmp) == scalar(@ino_info)) {
-                               delete @prev{@tmp};
-                               last if scalar(keys(%prev)) == @ino_info;
-                       }
-               }
-               is(scalar @tmp, scalar @ino_info,
-                       'old inotify watches replaced');
-               is(scalar keys %prev, scalar @ino_info,
-                       'no previous watches overlap');
-       };
+       for my $n (1..2) { # kick the event loop so we know HUP is done
+               my $m = $imap_client->new(%mic_opt);
+               ok($m->login && $m->IsAuthenticated && $m->logout,
+                       "connection $n works after HUP");
+       }
 
        open($fh, '<', 't/data/0001.patch') or BAIL_OUT("open: $!");
        run_script(['-mda', '--no-precheck'], $env, { 0 => $fh }) or
@@ -371,6 +352,10 @@ EOF
        @hits = $mic->search('SENTSINCE' => '18-Apr-2020');
        is_deeply(\@hits, [], 'search on dummy with condition works');
        ok(!$mic->search('SENTSINCE' => '18-Abr-2020'), 'bad month fails');
+       $mic->Uid(0);
+       my $ret = $mic->fetch_hash(2, 'RFC822');
+       is_deeply($ret, {},
+               'MSN FETCH on empty dummy will not trigger warnings, later');
 }); # each_inbox
 
 # message sequence numbers :<
@@ -383,11 +368,13 @@ is(scalar keys %$ret, 3, 'got all 3 messages');
 
 SKIP: {
        # do any clients use non-UID IMAP SEARCH?
-       skip 'Xapian missing', 2 if $level eq 'basic';
+       skip 'Xapian missing', 3 if $level eq 'basic';
        my $x = $mic->search('all');
        is_deeply($x, [1, 2, 3], 'MSN SEARCH works before rm');
        $x = $mic->search(qw(header subject embedded));
        is_deeply($x, [2], 'MSN SEARCH on Subject works before rm');
+       $x = $mic->search('FROM scraper@example.com');
+       is_deeply($x, [], "MSN SEARCH miss won't trigger warnings");
 }
 
 {
@@ -404,8 +391,11 @@ SKIP: {
        skip 'Xapian missing', 3 if $level eq 'basic';
        my $x = $mic->search(qw(header subject embedded));
        is(scalar(@$x), 1, 'MSN SEARCH on Subject works after rm');
-       $x = $mic->message_string($x->[0]);
-       is($x, $ret->{2}->{RFC822}, 'message 2 unchanged');
+       SKIP: {
+               skip 'previous test failed', 1 if !scalar(@$x);
+               $x = $mic->message_string($x->[0]);
+               is($x, $ret->{2}->{RFC822}, 'message 2 unchanged');
+       }
        $x = $mic->search(qw(text embedded));
        is(scalar(@$x), 1, 'MSN SEARCH on TEXT works after rm');
 }
@@ -463,7 +453,6 @@ SKIP: {
        my $url = "http://example.com/i1";
        my $inboxdir = "$tmpdir/watchimap";
        my $cmd = ['-init', '-V2', '-Lbasic', $name, $inboxdir, $url, $addr];
-       my ($ihost, $iport) = ($sock->sockhost, $sock->sockport);
        my $imapurl = "imap://$ihost:$iport/inbox.i1.0";
        run_script($cmd) or BAIL_OUT("init $name");
        xsys(qw(git config), "--file=$home/.public-inbox/config",