No ext_urls

[public-inbox.git] / t / lei-refresh-mail-sync.t

diff --git a/t/lei-refresh-mail-sync.t b/t/lei-refresh-mail-sync.t
index 90356b57b3e7ae5ed66435b4c3cfe8ff41bef89b..0498a0c428110271e2e0b1c3e36592b9f7ade5f1 100644 (file)
--- a/t/lei-refresh-mail-sync.t
+++ b/t/lei-refresh-mail-sync.t
@@ -4,17 +4,21 @@
 use strict; use v5.10.1; use PublicInbox::TestCommon;
 require_mods(qw(lei));
 use File::Path qw(remove_tree);
+require Socket;
+use Fcntl qw(F_SETFD);
+
+pipe(my ($stop_r, $stop_w)) or xbail "pipe: $!";
+fcntl($stop_w, F_SETFD, 0) or xbail "F_SETFD: $!";
 
 my $stop_daemon = sub { # needed since we don't have inotify
+       close $stop_w or xbail "close \$stop_w: $!";
        lei_ok qw(daemon-pid);
        chomp(my $pid = $lei_out);
        $pid > 0 or xbail "bad pid: $pid";
        kill('TERM', $pid) or xbail "kill: $!";
-       for (0..10) {
-               tick;
-               kill(0, $pid) or last;
-       }
-       kill(0, $pid) and xbail "daemon still running (PID:$pid)";
+       is(sysread($stop_r, my $buf, 1), 0, 'daemon stop pipe read EOF');
+       pipe($stop_r, $stop_w) or xbail "pipe: $!";
+       fcntl($stop_w, F_SETFD, 0) or xbail "F_SETFD: $!";
 };
 
 test_lei({ daemon_only => 1 }, sub {
@@ -81,16 +85,16 @@ SKIP: {
        my $cfg_path2 = "$home/cfg2";
        File::Copy::cp($cfg_path, $cfg_path2);
        my $env = { PI_CONFIG => $cfg_path2 };
+       my $sock_cls;
        for my $x (qw(imapd)) {
                my $s = tcp_server;
+               $sock_cls //= ref($s);
                my $cmd = [ "-$x", '-W0', "--stdout=$home/$x.out",
                        "--stderr=$home/$x.err" ];
-               my $td = start_script($cmd, $env, { 3 => $s}) or xbail("-$x");
-               $srv->{$x} = {
-                       addr => (my $scalar = tcp_host_port($s)),
-                       td => $td,
-                       cmd => $cmd,
-               };
+               my $opt = { 3 => $s, -CLOFORK => [ $stop_w ] };
+               my $td = start_script($cmd, $env, $opt) or xbail("-$x");
+               my $addr = tcp_host_port($s);
+               $srv->{$x} = { addr => $addr, td => $td, cmd => $cmd, s => $s };
        }
        my $url = "imap://$srv->{imapd}->{addr}/t.v1.0";
        lei_ok 'import', $url, '+L:v1';
@@ -120,14 +124,27 @@ SKIP: {
        $before = $lei_out;
        delete $srv->{imapd}->{td}; # kill + join daemon
 
+       my $pid = fork // xbail "fork";
+       if ($pid == 0) { # dummy server to kill new connections
+               $SIG{TERM} = sub { POSIX::_exit(0) };
+               $srv->{imapd}->{s}->blocking(1);
+               while (1) {
+                       my $caddr = accept(my $c, $srv->{imapd}->{s}) // next;
+                       shutdown($c, 2);
+               }
+               POSIX::_exit(0);
+       }
+       my $ar = PublicInbox::AutoReap->new($pid);
        ok(!(lei 'refresh-mail-sync', $url), 'URL fails on dead -imapd');
        ok(!(lei 'refresh-mail-sync', '--all'), '--all fails on dead -imapd');
+       $ar->kill for qw(avoid sig wake miss-no signalfd or EVFILT_SIG);
+       $ar->join('TERM');
 
-       # restart server (somewhat dangerous since we released the socket)
        my $cmd = $srv->{imapd}->{cmd};
-       push @$cmd, '-l', $srv->{imapd}->{addr};
-       $srv->{imapd}->{td} = start_script($cmd, $env) or xbail "@$cmd";
-
+       my $s = $srv->{imapd}->{s};
+       $s->blocking(0);
+       my $opt = { 3 => $s, -CLOFORK => [ $stop_w ] };
+       $srv->{imapd}->{td} = start_script($cmd, $env, $opt) or xbail "@$cmd";
        lei_ok 'refresh-mail-sync', '--all';
        lei_ok 'inspect', "blob:$oid";
        is($lei_out, $before, 'no changes when server was down');