From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <e@80x24.org>
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net
X-Spam-Level: 
X-Spam-ASN:  
X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00
	shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2
Received: from localhost (dcvr.yhbt.net [127.0.0.1])
	by dcvr.yhbt.net (Postfix) with ESMTP id 016421F4B4
	for <meta@public-inbox.org>; Tue, 20 Apr 2021 09:17:28 +0000 (UTC)
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] lei-sigpipe: update and move test from xt => t
Date: Tue, 20 Apr 2021 07:17:26 -0200
Message-Id: <20210420091726.69835-1-e@80x24.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
List-Id: <meta.public-inbox.org>

We have "lei import" and better test infrastructure for lei,
now, so we can more easily test SIGPIPE without relying on
an already-configured instance.
---
 MANIFEST         |  2 +-
 t/lei-sigpipe.t  | 43 +++++++++++++++++++++++++++++++++++
 xt/lei-sigpipe.t | 58 ------------------------------------------------
 3 files changed, 44 insertions(+), 59 deletions(-)
 create mode 100644 t/lei-sigpipe.t
 delete mode 100644 xt/lei-sigpipe.t

diff --git a/MANIFEST b/MANIFEST
index f35c514c..f4a55687 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -398,6 +398,7 @@ t/lei-q-kw.t
 t/lei-q-remote-import.t
 t/lei-q-save.t
 t/lei-q-thread.t
+t/lei-sigpipe.t
 t/lei-tag.t
 t/lei.t
 t/lei_dedupe.t
@@ -501,7 +502,6 @@ xt/httpd-async-stream.t
 xt/imapd-mbsync-oimap.t
 xt/imapd-validate.t
 xt/lei-auth-fail.t
-xt/lei-sigpipe.t
 xt/mem-imapd-tls.t
 xt/mem-msgview.t
 xt/msgtime_cmp.t
diff --git a/t/lei-sigpipe.t b/t/lei-sigpipe.t
new file mode 100644
index 00000000..f84d6d22
--- /dev/null
+++ b/t/lei-sigpipe.t
@@ -0,0 +1,43 @@
+#!perl -w
+# Copyright (C) 2021 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+use strict;
+use v5.10.1;
+use PublicInbox::TestCommon;
+use POSIX qw(WTERMSIG WIFSIGNALED SIGPIPE);
+test_lei(sub {
+	my $f = "$ENV{HOME}/big.eml";
+	my $imported;
+	for my $out ([], [qw(-f mboxcl2)]) {
+		pipe(my ($r, $w)) or BAIL_OUT $!;
+		my $size = 65536;
+		if ($^O eq 'linux' && fcntl($w, 1031, 4096)) {
+			$size = 4096;
+		}
+		unless (-f $f) {
+			open my $fh, '>', $f or xbail "open $f: $!";
+			print $fh <<'EOM' or xbail;
+From: big@example.com
+Message-ID: <big@example.com>
+EOM
+			print $fh 'Subject:';
+			print $fh (' '.('x' x 72)."\n") x (($size / 73) + 1);
+			print $fh "\nbody\n";
+			close $fh or xbail "close: $!";
+		}
+
+		lei_ok(qw(import), $f) if $imported++ == 0;
+		open my $errfh, '>>', "$ENV{HOME}/stderr.log" or xbail $!;
+		my $opt = { run_mode => 0, 2 => $errfh, 1 => $w };
+		my $cmd = [qw(lei q -q -t), @$out, 'z:1..'];
+		my $tp = start_script($cmd, undef, $opt);
+		close $w;
+		is(sysread($r, my $buf, 1), 1, 'read one byte');
+		close $r; # trigger SIGPIPE
+		$tp->join;
+		ok(WIFSIGNALED($?), "signaled @$out");
+		is(WTERMSIG($?), SIGPIPE, "got SIGPIPE @$out");
+	}
+});
+
+done_testing;
diff --git a/xt/lei-sigpipe.t b/xt/lei-sigpipe.t
deleted file mode 100644
index 44020bad..00000000
--- a/xt/lei-sigpipe.t
+++ /dev/null
@@ -1,58 +0,0 @@
-#!perl -w
-# Copyright (C) 2021 all contributors <meta@public-inbox.org>
-# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
-use strict;
-use v5.10.1;
-use Test::More;
-use PublicInbox::TestCommon;
-use POSIX qw(WTERMSIG WIFSIGNALED SIGPIPE);
-require_mods(qw(json DBD::SQLite Search::Xapian));
-# XXX this needs an already configured lei instance with many messages
-
-my $do_test = sub {
-	my $env = shift // {};
-	for my $out ([], [qw(-f mboxcl2)]) {
-		pipe(my ($r, $w)) or BAIL_OUT $!;
-		open my $err, '+>', undef or BAIL_OUT $!;
-		my $opt = { run_mode => 0, 1 => $w, 2 => $err };
-		my $cmd = [qw(lei q -q -t), @$out, 'z:1..'];
-		my $tp = start_script($cmd, $env, $opt);
-		close $w;
-		sysread($r, my $buf, 1);
-		close $r; # trigger SIGPIPE
-		$tp->join;
-		ok(WIFSIGNALED($?), "signaled @$out");
-		is(WTERMSIG($?), SIGPIPE, "got SIGPIPE @$out");
-		seek($err, 0, 0);
-		my @err = grep(!m{mkdir /dev/null\b}, <$err>);
-		is_deeply(\@err, [], "no errors @$out");
-	}
-};
-
-my ($tmp, $for_destroy) = tmpdir();
-my $pid;
-my $opt = { run_mode => 0, 1 => \(my $out = '') };
-if (run_script([qw(lei daemon-pid)], undef, $opt)) {
-	chomp($pid = $out);
-	mkdir "$tmp/d" or BAIL_OUT $!;
-	local $ENV{TMPDIR} = "$tmp/d";
-	$do_test->();
-	$out = '';
-	ok(run_script([qw(lei daemon-pid)], undef, $opt), 'daemon-pid again');
-	chomp($out);
-	is($out, $pid, 'daemon-pid unchanged');
-	ok(kill(0, $pid), 'daemon still running');
-	$out = '';
-}
-{
-	mkdir "$tmp/1" or BAIL_OUT $!;
-	local $ENV{TMPDIR} = "$tmp/1";
-	$do_test->({XDG_RUNTIME_DIR => '/dev/null'});
-	is(unlink(glob("$tmp/1/*")), 0, 'nothing left over w/ oneshot');
-}
-
-# the one-shot test should be slow enough that the daemon has cleaned
-# up in the background:
-is_deeply([glob("$tmp/d/*")], [], 'nothing left over with daemon');
-
-done_testing;