X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Flei-q-remote-import.t;h=92d8c9b6058c3cac5932b0a78dd58ee9b8d1c362;hb=4eee5af6011cc8cdefb66c9729952c7eff5c0b0b;hp=4088b6ada1567ed97f7d6f98ba3e0a2e160c474d;hpb=3104d7492aa4aee07455dcad7449f786188afdf5;p=public-inbox.git

diff --git a/t/lei-q-remote-import.t b/t/lei-q-remote-import.t
index 4088b6ad..92d8c9b6 100644
--- a/t/lei-q-remote-import.t
+++ b/t/lei-q-remote-import.t
@@ -2,8 +2,8 @@
 # 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;
-require_git 2.6;
-require_mods(qw(json DBD::SQLite Search::Xapian));
+require_mods(qw(lei -httpd));
+require_cmd 'curl';
 use PublicInbox::MboxReader;
 my ($ro_home, $cfg_path) = setup_public_inboxes;
 my $sock = tcp_server;
@@ -36,7 +36,8 @@ test_lei({ tmpdir => $tmpdir }, sub {
 	is_deeply($slurp_emls->($o), $exp1, 'got results after remote search');
 	unlink $o or BAIL_OUT $!;
 	lei_ok(@cmd);
-	ok(-f $o && -s _, 'output exists after import but is not empty');
+	ok(-f $o && -s _, 'output exists after import but is not empty') or
+		diag $lei_err;
 	is_deeply($slurp_emls->($o), $exp1, 'got results w/o remote search');
 	unlink $o or BAIL_OUT $!;
 
@@ -49,14 +50,58 @@ test_lei({ tmpdir => $tmpdir }, sub {
 
 	open my $fh, '>', "$o.lock";
 	$cmd[-1] = 'm:qp@example.com';
-	unlink $o or BAIL_OUT $!;
+	unlink $o or xbail("unlink $o $! cwd=".Cwd::getcwd());
 	lei_ok(@cmd, '--lock=none');
-	ok(-f $o && -s _, '--lock=none respected');
-	unlink $o or BAIL_OUT $!;
+	ok(-f $o && -s _, '--lock=none respected') or diag $lei_err;
+	unlink $o or xbail("unlink $o $! cwd=".Cwd::getcwd());
 	ok(!lei(@cmd, '--lock=dotlock,timeout=0.000001'), 'dotlock fails');
+	like($lei_err, qr/dotlock timeout/, 'timeout noted');
 	ok(-f $o && !-s _, 'nothing output on lock failure');
 	unlink "$o.lock" or BAIL_OUT $!;
 	lei_ok(@cmd, '--lock=dotlock,timeout=0.000001',
 		\'succeeds after lock removal');
+
+	my $ibx = create_inbox 'local-external', indexlevel => 'medium', sub {
+		my ($im) = @_;
+		$im->add(eml_load('t/utf8.eml')) or BAIL_OUT '->add';
+	};
+	lei_ok(qw(add-external -q), $ibx->{inboxdir});
+	lei_ok(qw(q -q -o), "mboxrd:$o", '--only', $url,
+		'm:testmessage@example.com');
+	is($lei_err, '', 'no warnings or errors');
+	ok(-s $o, 'got result from remote external');
+	my $exp = eml_load('t/utf8.eml');
+	is_deeply($slurp_emls->($o), [$exp], 'got expected result');
+	lei_ok(qw(q --no-external -o), "mboxrd:/dev/stdout",
+			'm:testmessage@example.com');
+	is($lei_out, '', 'message not imported when in local external');
+
+	open $fh, '>', $o or BAIL_OUT;
+	print $fh <<'EOF' or BAIL_OUT;
+From a@z Mon Sep 17 00:00:00 2001
+From: nobody@localhost
+Date: Sat, 13 Mar 2021 18:23:01 +0600
+Message-ID: <never-before-seen@example.com>
+Status: OR
+
+whatever
+EOF
+	close $fh or BAIL_OUT;
+	lei_ok(qw(q -o), "mboxrd:$o", 'm:testmessage@example.com');
+	is_deeply($slurp_emls->($o), [$exp],
+		'got expected result after clobber') or diag $lei_err;
+	lei_ok(qw(q -o mboxrd:/dev/stdout m:never-before-seen@example.com));
+	like($lei_out, qr/seen\@example\.com>\nStatus: RO\n\nwhatever/sm,
+		'--import-before imported totally unseen message');
+
+	lei_ok(qw(q --save z:0.. -o), "$ENV{HOME}/md", '--only', $url);
+	my @f = glob("$ENV{HOME}/md/*/*");
+	lei_ok('up', "$ENV{HOME}/md");
+	is_deeply(\@f, [ glob("$ENV{HOME}/md/*/*") ],
+		'lei up remote dedupe works on maildir');
+	my $edit_env = { VISUAL => 'cat', EDITOR => 'cat' };
+	lei_ok([qw(edit-search), "$ENV{HOME}/md"], $edit_env);
+	like($lei_out, qr/^\Q[external "$url"]\E\n\s*lastresult = \d+/sm,
+		'lastresult set');
 });
 done_testing;