www: drop --subject from "git send-email" instructions

[public-inbox.git] / t / lei-q-remote-import.t

diff --git a/t/lei-q-remote-import.t b/t/lei-q-remote-import.t
index 25e461ac640bb81d653d275a166ab3799841e70c..92d8c9b6058c3cac5932b0a78dd58ee9b8d1c362 100644 (file)
--- 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;
@@ -50,11 +50,12 @@ 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',
@@ -65,8 +66,9 @@ test_lei({ tmpdir => $tmpdir }, sub {
                $im->add(eml_load('t/utf8.eml')) or BAIL_OUT '->add';
        };
        lei_ok(qw(add-external -q), $ibx->{inboxdir});
-       lei_ok(qw(q -o), "mboxrd:$o", '--only', $url,
+       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');
@@ -91,5 +93,15 @@ EOF
        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;