X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Flei-q-remote-import.t;h=fdf6a11e3b574e5b32e736881c7849e6ea18156d;hb=21fd0da3bcfba4d3564d262f88d3fd7479b6d5ee;hp=8b82579c167eda4168bd28939e10e8f025c48afc;hpb=42fc590f8cabd23455949d002e2ddf28bbec6d1e;p=public-inbox.git
diff --git a/t/lei-q-remote-import.t b/t/lei-q-remote-import.t
index 8b82579c..fdf6a11e 100644
--- a/t/lei-q-remote-import.t
+++ b/t/lei-q-remote-import.t
@@ -2,10 +2,9 @@
# Copyright (C) 2021 all contributors
# License: AGPL-3.0+
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;
-use PublicInbox::InboxWritable;
my ($ro_home, $cfg_path) = setup_public_inboxes;
my $sock = tcp_server;
my ($tmpdir, $for_destroy) = tmpdir;
@@ -51,32 +50,25 @@ 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');
- # XXX memoize this external creation
- my $inboxdir = "$ENV{HOME}/tmp_git";
- my $ibx = PublicInbox::InboxWritable->new({
- name => 'tmp',
- -primary_address => 'lei@example.com',
- inboxdir => $inboxdir,
- indexlevel => 'medium',
- }, { nproc => 1 });
- my $im = $ibx->importer(0);
- $im->add(eml_load('t/utf8.eml')) or BAIL_OUT '->add';
- $im->done;
-
- run_script(['-index', $inboxdir], undef) or BAIL_OUT '-init';
- lei_ok(qw(add-external -q), $inboxdir);
- lei_ok(qw(q -o), "mboxrd:$o", '--only', $url,
+ 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');
@@ -90,7 +82,7 @@ From a@z Mon Sep 17 00:00:00 2001
From: nobody@localhost
Date: Sat, 13 Mar 2021 18:23:01 +0600
Message-ID:
-Status: RO
+Status: OR
whatever
EOF
@@ -99,7 +91,17 @@ EOF
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: OR\n\nwhatever/sm,
+ 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' };
+ 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;