X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Flei-refresh-mail-sync.t;h=0498a0c428110271e2e0b1c3e36592b9f7ade5f1;hb=1d88b8639596a549dd972e113b52f9c2d035d529;hp=43fbc50a2d46578908f527b6e4d8dad7eac21ca6;hpb=cabfdc1dc4d62a697e3ebbc886cb3da9f1fc7186;p=public-inbox.git

diff --git a/t/lei-refresh-mail-sync.t b/t/lei-refresh-mail-sync.t
index 43fbc50a..0498a0c4 100644
--- a/t/lei-refresh-mail-sync.t
+++ b/t/lei-refresh-mail-sync.t
@@ -5,17 +5,20 @@ 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 {
@@ -88,12 +91,10 @@ SKIP: {
 		$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';
@@ -123,21 +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 $listen = $sock_cls->new(
-		ReuseAddr => 1,
-		Proto => 'tcp',
-		Type => Socket::SOCK_STREAM(),
-		Listen => 1024,
-		Blocking => 0,
-		LocalAddr => $srv->{imapd}->{addr},
-	) or xbail "$sock_cls->new: $!";
 	my $cmd = $srv->{imapd}->{cmd};
-	$srv->{imapd}->{td} = start_script($cmd, $env, { 3 => $listen }) 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');