We can use the same "local $ENV{FOO}" hack we do with
t/nntpd-v2.t to test the oneshot code path without imposing
an extra script in the users' $PATH.
t/init.t
t/iso-2202-jp.eml
t/kqnotify.t
t/init.t
t/iso-2202-jp.eml
t/kqnotify.t
t/lei.t
t/lei_store.t
t/linkify.t
t/lei.t
t/lei_store.t
t/linkify.t
sub key2sub ($) {
my ($key) = @_;
$cached_scripts{$key} //= do {
sub key2sub ($) {
my ($key) = @_;
$cached_scripts{$key} //= do {
--- /dev/null
+#!perl -w
+# Copyright (C) 2020 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;
+$PublicInbox::TestCommon::cached_scripts{'lei-oneshot'} //= do {
+ eval <<'EOF';
+package LeiOneshot;
+use strict;
+use subs qw(exit);
+*exit = \&PublicInbox::TestCommon::run_script_exit;
+sub main {
+# the below "line" directive is a magic comment, see perlsyn(1) manpage
+# line 1 "lei-oneshot"
+ require PublicInbox::LeiDaemon;
+ PublicInbox::LeiDaemon::oneshot(__PACKAGE__);
+ 0;
+}
+1;
+EOF
+ LeiOneshot->can('main');
+};
+local $ENV{TEST_LEI_ONESHOT} = '1';
+require './t/lei.t';
use PublicInbox::Config;
use File::Path qw(rmtree);
require_mods(qw(json DBD::SQLite Search::Xapian));
use PublicInbox::Config;
use File::Path qw(rmtree);
require_mods(qw(json DBD::SQLite Search::Xapian));
+my $LEI = 'lei';
+my $lei = sub {
+ my ($cmd, $env, $opt) = @_;
+ run_script([$LEI, @$cmd], $env, $opt);
+};
+
my ($home, $for_destroy) = tmpdir();
my $opt = { 1 => \(my $out = ''), 2 => \(my $err = '') };
delete local $ENV{XDG_DATA_HOME};
my ($home, $for_destroy) = tmpdir();
my $opt = { 1 => \(my $out = ''), 2 => \(my $err = '') };
delete local $ENV{XDG_DATA_HOME};
mkdir "$home/xdg_run", 0700 or BAIL_OUT "mkdir: $!";
my $test_lei_common = sub {
mkdir "$home/xdg_run", 0700 or BAIL_OUT "mkdir: $!";
my $test_lei_common = sub {
- ok(!run_script([qw(lei)], undef, $opt), 'no args fails');
+ ok(!$lei->([], undef, $opt), 'no args fails');
is($? >> 8, 1, '$? is 1');
is($out, '', 'nothing in stdout');
like($err, qr/^usage:/sm, 'usage in stderr');
for my $arg (['-h'], ['--help'], ['help'], [qw(daemon-pid --help)]) {
$out = $err = '';
is($? >> 8, 1, '$? is 1');
is($out, '', 'nothing in stdout');
like($err, qr/^usage:/sm, 'usage in stderr');
for my $arg (['-h'], ['--help'], ['help'], [qw(daemon-pid --help)]) {
$out = $err = '';
- ok(run_script(['lei', @$arg], undef, $opt), "lei @$arg");
+ ok($lei->($arg, undef, $opt), "lei @$arg");
like($out, qr/^usage:/sm, "usage in stdout (@$arg)");
is($err, '', "nothing in stderr (@$arg)");
}
for my $arg ([''], ['--halp'], ['halp'], [qw(daemon-pid --halp)]) {
$out = $err = '';
like($out, qr/^usage:/sm, "usage in stdout (@$arg)");
is($err, '', "nothing in stderr (@$arg)");
}
for my $arg ([''], ['--halp'], ['halp'], [qw(daemon-pid --halp)]) {
$out = $err = '';
- ok(!run_script(['lei', @$arg], undef, $opt), "lei @$arg");
+ ok(!$lei->($arg, undef, $opt), "lei @$arg");
is($? >> 8, 1, '$? set correctly');
isnt($err, '', 'something in stderr');
is($out, '', 'nothing in stdout');
is($? >> 8, 1, '$? set correctly');
isnt($err, '', 'something in stderr');
is($out, '', 'nothing in stdout');
};
my $home_trash = [ "$home/.local", "$home/.config" ];
rmtree($home_trash);
};
my $home_trash = [ "$home/.local", "$home/.config" ];
rmtree($home_trash);
- ok(run_script([qw(lei init)], undef, $opt), 'init w/o args');
+ ok($lei->(['init'], undef, $opt), 'init w/o args');
$ok_err_info->('after init w/o args');
$ok_err_info->('after init w/o args');
- ok(run_script([qw(lei init)], undef, $opt), 'idempotent init w/o args');
+ ok($lei->(['init'], undef, $opt), 'idempotent init w/o args');
$ok_err_info->('after idempotent init w/o args');
$ok_err_info->('after idempotent init w/o args');
- ok(!run_script([qw(lei init), "$home/x"], undef, $opt),
+ ok(!$lei->(['init', "$home/x"], undef, $opt),
'init conflict');
is(grep(/^E:/, split(/^/, $err)), 1, 'got error on conflict');
ok(!-e "$home/x", 'nothing created on conflict');
rmtree($home_trash);
$err = '';
'init conflict');
is(grep(/^E:/, split(/^/, $err)), 1, 'got error on conflict');
ok(!-e "$home/x", 'nothing created on conflict');
rmtree($home_trash);
$err = '';
- ok(run_script([qw(lei init), "$home/x"], undef, $opt),
- 'init conflict resolved');
+ ok($lei->(['init', "$home/x"], undef, $opt), 'init conflict resolved');
$ok_err_info->('init w/ arg');
$ok_err_info->('init w/ arg');
- ok(run_script([qw(lei init), "$home/x"], undef, $opt),
- 'init idempotent with path');
+ ok($lei->(['init', "$home/x"], undef, $opt), 'init idempotent w/ path');
$ok_err_info->('init idempotent w/ arg');
ok(-d "$home/x", 'created dir');
rmtree([ "$home/x", @$home_trash ]);
$err = '';
$ok_err_info->('init idempotent w/ arg');
ok(-d "$home/x", 'created dir');
rmtree([ "$home/x", @$home_trash ]);
$err = '';
- ok(!run_script([qw(lei init), "$home/x", "$home/2" ], undef, $opt),
+ ok(!$lei->(['init', "$home/x", "$home/2" ], undef, $opt),
'too many args fails');
like($err, qr/too many/, 'noted excessive');
ok(!-e "$home/x", 'x not created on excessive');
'too many args fails');
like($err, qr/too many/, 'noted excessive');
ok(!-e "$home/x", 'x not created on excessive');
is($out, '', 'nothing in stdout');
};
is($out, '', 'nothing in stdout');
};
+my $test_lei_oneshot = $ENV{TEST_LEI_ONESHOT};
+ last SKIP if $test_lei_oneshot;
require_mods('IO::FDPass', 16);
my $sock = "$ENV{XDG_RUNTIME_DIR}/lei/sock";
require_mods('IO::FDPass', 16);
my $sock = "$ENV{XDG_RUNTIME_DIR}/lei/sock";
tick();
}
ok(!kill(0, $new_pid), 'daemon exits after unlink');
tick();
}
ok(!kill(0, $new_pid), 'daemon exits after unlink');
- $test_lei_common = undef; # success over socket, can't test without
+ # success over socket, can't test without
+ $test_lei_common = undef;
};
require_ok 'PublicInbox::LeiDaemon';
};
require_ok 'PublicInbox::LeiDaemon';
+$LEI = 'lei-oneshot' if $test_lei_oneshot;
$test_lei_common->() if $test_lei_common;
done_testing;
$test_lei_common->() if $test_lei_common;
done_testing;