use PublicInbox::Config;
use File::Path qw(rmtree);
require_mods(qw(json DBD::SQLite Search::Xapian));
-my ($home, $for_destroy) = tmpdir();
+my $LEI = 'lei';
my $opt = { 1 => \(my $out = ''), 2 => \(my $err = '') };
+my $lei = sub {
+ my ($cmd, $env, $opt) = @_;
+ $out = $err = '';
+ if (!ref($cmd)) {
+ ($env, $opt) = grep { (!defined) || ref } @_;
+ $cmd = [ grep { defined } @_ ];
+ }
+ run_script([$LEI, @$cmd], $env, $opt);
+};
+
+my ($home, $for_destroy) = tmpdir();
delete local $ENV{XDG_DATA_HOME};
delete local $ENV{XDG_CONFIG_HOME};
local $ENV{XDG_RUNTIME_DIR} = "$home/xdg_run";
local $ENV{HOME} = $home;
+local $ENV{FOO} = 'BAR';
mkdir "$home/xdg_run", 0700 or BAIL_OUT "mkdir: $!";
+my $home_trash = [ "$home/.local", "$home/.config" ];
+my $cleanup = sub { rmtree([@$home_trash, @_]) };
-my $test_lei_common = sub {
- ok(!run_script([qw(lei)], undef, $opt), 'no args fails');
+my $test_help = sub {
+ 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 = '';
- 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 = '';
- 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');
}
+ ok($lei->(qw(init -h), undef, $opt), 'init -h');
+ like($out, qr! \Q$home\E/\.local/share/lei/store\b!,
+ 'actual path shown in init -h');
+ ok($lei->(qw(init -h), { XDG_DATA_HOME => '/XDH' }, $opt),
+ 'init with XDG_DATA_HOME');
+ like($out, qr! /XDH/lei/store\b!, 'XDG_DATA_HOME in init -h');
+ is($err, '', 'no errors from init -h');
- # init tests
- $out = $err = '';
- my $ok_err_info = sub {
- my ($msg) = @_;
- is(grep(!/^I:/, split(/^/, $err)), 0, $msg) or
- diag "$msg: err=$err";
- $err = '';
- };
- my $home_trash = [ "$home/.local", "$home/.config" ];
- rmtree($home_trash);
- ok(run_script([qw(lei init)], undef, $opt), 'init w/o args');
+ ok($lei->(qw(config -h), undef, $opt), 'config-h');
+ like($out, qr! \Q$home\E/\.config/lei/config\b!,
+ 'actual path shown in config -h');
+ ok($lei->(qw(config -h), { XDG_CONFIG_HOME => '/XDC' }, $opt),
+ 'config with XDG_CONFIG_HOME');
+ like($out, qr! /XDC/lei/config\b!, 'XDG_CONFIG_HOME in config -h');
+ is($err, '', 'no errors from config -h');
+};
+
+my $ok_err_info = sub {
+ my ($msg) = @_;
+ is(grep(!/^I:/, split(/^/, $err)), 0, $msg) or
+ diag "$msg: err=$err";
+ $err = '';
+};
+
+my $test_init = sub {
+ $cleanup->();
+ ok($lei->(['init'], undef, $opt), '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(!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);
+ $cleanup->();
- $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(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 ]);
+ $cleanup->("$home/x");
- $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');
my $base = (split(m!/!, $d))[-1];
ok(!-d $d, "$base not created");
}
- is($out, '', 'nothing in stdout');
+ is($out, '', 'nothing in stdout on init failure');
};
+my $test_config = sub {
+ $cleanup->();
+ ok($lei->([qw(config a.b c)], undef, $opt), 'config set var');
+ is($out.$err, '', 'no output on var set');
+ ok($lei->([qw(config -l)], undef, $opt), 'config -l');
+ is($err, '', 'no errors on listing');
+ is($out, "a.b=c\n", 'got expected output');
+ ok(!$lei->([qw(config -f), "$home/.config/f", qw(x.y z)], undef, $opt),
+ 'config set var with -f fails');
+ like($err, qr/not supported/, 'not supported noted');
+ ok(!-f "$home/config/f", 'no file created');
+};
+
+my $test_lei_common = sub {
+ $test_help->();
+ $test_config->();
+ $test_init->();
+};
+
+my $test_lei_oneshot = $ENV{TEST_LEI_ONESHOT};
SKIP: {
- require_mods('IO::FDPass', 16);
+ last SKIP if $test_lei_oneshot;
+ require_mods(qw(IO::FDPass Cwd), 41);
my $sock = "$ENV{XDG_RUNTIME_DIR}/lei/sock";
ok(run_script([qw(lei daemon-pid)], undef, $opt), 'daemon-pid');
chomp(my $pid_again = $out);
is($pid, $pid_again, 'daemon-pid idempotent');
+ $out = '';
+ ok(run_script([qw(lei daemon-env -0)], undef, $opt), 'show env');
+ is($err, '', 'no errors in env dump');
+ my @env = split(/\0/, $out);
+ is(scalar grep(/\AHOME=\Q$home\E\z/, @env), 1, 'env has HOME');
+ is(scalar grep(/\AFOO=BAR\z/, @env), 1, 'env has FOO=BAR');
+ is(scalar grep(/\AXDG_RUNTIME_DIR=/, @env), 1, 'has XDG_RUNTIME_DIR');
+
+ $out = '';
+ ok(run_script([qw(lei daemon-env -u FOO)], undef, $opt), 'unset');
+ is($out.$err, '', 'no output for unset');
+ ok(run_script([qw(lei daemon-env -0)], undef, $opt), 'show again');
+ is($err, '', 'no errors in env dump');
+ @env = split(/\0/, $out);
+ is(scalar grep(/\AFOO=BAR\z/, @env), 0, 'env unset FOO');
+
+ $out = '';
+ ok(run_script([qw(lei daemon-env -u FOO -u HOME -u XDG_RUNTIME_DIR)],
+ undef, $opt), 'unset multiple');
+ is($out.$err, '', 'no errors output for unset');
+ ok(run_script([qw(lei daemon-env -0)], undef, $opt), 'show again');
+ is($err, '', 'no errors in env dump');
+ @env = split(/\0/, $out);
+ is(scalar grep(/\A(?:HOME|XDG_RUNTIME_DIR)=\z/, @env), 0, 'env unset@');
+ $out = '';
+ ok(run_script([qw(lei daemon-env -)], undef, $opt), 'clear env');
+ is($out.$err, '', 'no output');
+ ok(run_script([qw(lei daemon-env)], undef, $opt), 'env is empty');
+ is($out, '', 'env cleared');
+
ok(run_script([qw(lei daemon-stop)], undef, $opt), 'daemon-stop');
is($out, '', 'no output from daemon-stop');
is($err, '', 'no error from daemon-stop');
chomp(my $new_pid = $out);
ok(kill(0, $new_pid), 'new pid is running');
ok(-S $sock, 'sock exists again');
- unlink $sock or BAIL_OUT "unlink $!";
+
+ if ('socket inaccessible') {
+ chmod 0000, $sock or BAIL_OUT "chmod 0000: $!";
+ $out = $err = '';
+ ok(run_script([qw(lei help)], undef, $opt),
+ 'connect fail, one-shot fallback works');
+ like($err, qr/\bconnect\(/, 'connect error noted');
+ like($out, qr/^usage: /, 'help output works');
+ chmod 0700, $sock or BAIL_OUT "chmod 0700: $!";
+ }
+ if ('oneshot on cwd gone') {
+ my $cwd = Cwd::fastcwd() or BAIL_OUT "fastcwd: $!";
+ my $d = "$home/to-be-removed";
+ mkdir $d or BAIL_OUT "mkdir($d) $!";
+ chdir $d or BAIL_OUT "chdir($d) $!";
+ if (rmdir($d)) {
+ $out = $err = '';
+ ok(run_script([qw(lei help)], undef, $opt),
+ 'cwd fail, one-shot fallback works');
+ } else {
+ $err = "rmdir=$!";
+ }
+ chdir $cwd or BAIL_OUT "chdir($cwd) $!";
+ like($err, qr/cwd\(/, 'cwd error noted');
+ like($out, qr/^usage: /, 'help output still works');
+ }
+
+ unlink $sock or BAIL_OUT "unlink($sock) $!";
for (0..100) {
kill('CHLD', $new_pid) or last;
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::LEI';
+$LEI = 'lei-oneshot' if $test_lei_oneshot;
$test_lei_common->() if $test_lei_common;
done_testing;