run_script start_script key2sub xsys xsys_e xqx eml_load tick
have_xapian_compact json_utf8 setup_public_inboxes
tcp_host_port test_lei lei lei_ok
- $lei $lei_out $lei_err $lei_opt);
+ $lei_out $lei_err $lei_opt);
require Test::More;
my @methods = grep(!/\W/, @Test::More::EXPORT);
eval(join('', map { "*$_=\\&Test::More::$_;" } @methods));
}
our ($err_skip, $lei_opt, $lei_out, $lei_err);
-our $lei = sub {
+# favor lei() or lei_ok() over $lei for new code
+sub lei (@) {
my ($cmd, $env, $xopt) = @_;
$lei_out = $lei_err = '';
if (!ref($cmd)) {
$res;
};
-sub lei (@) { $lei->(@_) }
-
sub lei_ok (@) {
my $msg = ref($_[-1]) eq 'SCALAR' ? pop(@_) : undef;
my $tmpdir = quotemeta(File::Spec->tmpdir);
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;
- delete local $ENV{XDG_DATA_HOME};
- delete local $ENV{XDG_CONFIG_HOME};
- local $ENV{GIT_COMMITTER_EMAIL} = 'lei@example.com';
- local $ENV{GIT_COMMITTER_NAME} = 'lei user';
+ local %ENV = %ENV;
+ delete $ENV{XDG_DATA_HOME};
+ delete $ENV{XDG_CONFIG_HOME};
+ $ENV{GIT_COMMITTER_EMAIL} = 'lei@example.com';
+ $ENV{GIT_COMMITTER_NAME} = 'lei user';
my (undef, $fn, $lineno) = caller(0);
my $t = "$fn:$lineno";
require PublicInbox::Spawn;
mkdir($xrd, 0700) or BAIL_OUT "mkdir: $!";
local $ENV{XDG_RUNTIME_DIR} = $xrd;
$cb->();
- ok($lei->(qw(daemon-pid)), "daemon-pid after $t");
+ lei_ok(qw(daemon-pid), \"daemon-pid after $t");
chomp($daemon_pid = $lei_out);
if ($daemon_pid) {
ok(kill(0, $daemon_pid), "daemon running after $t");
- ok($lei->(qw(daemon-kill)), "daemon-kill after $t");
+ lei_ok(qw(daemon-kill), \"daemon-kill after $t");
} else {
fail("daemon not running after $t");
}
local $ENV{HOME} = $home;
# force sun_path[108] overflow:
my $xrd = "$home/1shot-test".('.sun_path' x 108);
- local $err_skip = qr!\Q$xrd!; # for $lei->() filtering
+ local $err_skip = qr!\Q$xrd!; # for lei() filtering
local $ENV{XDG_RUNTIME_DIR} = $xrd;
$cb->();
}