t/lei_to_mail: split "lei import" test $HOME directory

"lei import" behavior will may change w.r.t. keyword
handling.  Use separate $HOME between different test_lei
to ensure isolation between the tests.

diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index b5d0b9f8f8619e413fd82f37ada97bbab87ae93d..49cecacdd2e933666ffe419de8ed2ca6fd206f64 100644 (file)
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -517,6 +517,7 @@ SKIP: {
        require_git(2.6, 1) or skip('git 2.6+ required for lei test', 2);
        require_mods(qw(json DBD::SQLite Search::Xapian), 2);
        require PublicInbox::Config;
+       require File::Path;
        local %ENV = %ENV;
        delete $ENV{XDG_DATA_HOME};
        delete $ENV{XDG_CONFIG_HOME};
@@ -534,6 +535,7 @@ EOM
        $lei_opt = { 1 => \$lei_out, 2 => \$lei_err };
        my ($daemon_pid, $for_destroy, $daemon_xrd);
        my $tmpdir = $test_opt->{tmpdir};
+       File::Path::mkpath($tmpdir) if (defined $tmpdir && !-d $tmpdir);
        ($tmpdir, $for_destroy) = tmpdir unless $tmpdir;
        state $persist_xrd = $ENV{TEST_LEI_DAEMON_PERSIST_DIR};
        SKIP: {

diff --git a/t/lei_to_mail.t b/t/lei_to_mail.t
index 513572579274fef5f49e7e1cfe14b687f28023b6..32532a980744fb67dd4270a06283845f7bd6a8bd 100644 (file)
--- a/t/lei_to_mail.t
+++ b/t/lei_to_mail.t
@@ -129,9 +129,9 @@ my $orig = do {
        $raw;
 };
 
-test_lei(sub {
-       ok(lei(qw(import -F), $mbox, $fn), 'imported mbox');
-       ok(lei(qw(q s:x)), 'lei q works') or diag $lei_err;
+test_lei({tmpdir => "$tmpdir/using -F"}, sub {
+       lei_ok(qw(import -F), $mbox, $fn, \'imported mbox');
+       lei_ok(qw(q s:x), \'lei q works') or diag $lei_err;
        my $res = json_utf8->decode($lei_out);
        my $x = $res->[0];
        is($x->{'s'}, 'x', 'subject imported') or diag $lei_out;
@@ -139,7 +139,7 @@ test_lei(sub {
        is($res->[1], undef, 'only one result');
 });
 
-test_lei(sub {
+test_lei({tmpdir => "$tmpdir/using TYPE: prefix"}, sub {
        lei_ok('import', "$mbox:$fn", \'imported mbox:/path') or diag $lei_err;
        lei_ok(qw(q s:x), \'lei q works') or diag $lei_err;
        my $res = json_utf8->decode($lei_out);