t/lei*: drop $lei->(...) sub

[public-inbox.git] / t / lei-daemon.t

diff --git a/t/lei-daemon.t b/t/lei-daemon.t
index c55ba86c9a6255f3bf81b8d4cb302ce57974ddb1..c30e5ac17edfd814fdafa4cdb1820877d76c13bf 100644 (file)
--- a/t/lei-daemon.t
+++ b/t/lei-daemon.t
@@ -6,7 +6,7 @@ use strict; use v5.10.1; use PublicInbox::TestCommon;
 test_lei({ daemon_only => 1 }, sub {
        my $sock = "$ENV{XDG_RUNTIME_DIR}/lei/5.seq.sock";
        my $err_log = "$ENV{XDG_RUNTIME_DIR}/lei/errors.log";
-       ok($lei->('daemon-pid'), 'daemon-pid');
+       lei_ok('daemon-pid');
        is($lei_err, '', 'no error from daemon-pid');
        like($lei_out, qr/\A[0-9]+\n\z/s, 'pid returned') or BAIL_OUT;
        chomp(my $pid = $lei_out);
@@ -17,12 +17,12 @@ test_lei({ daemon_only => 1 }, sub {
        print $efh "phail\n" or BAIL_OUT $!;
        close $efh or BAIL_OUT $!;
 
-       ok($lei->('daemon-pid'), 'daemon-pid');
+       lei_ok('daemon-pid');
        chomp(my $pid_again = $lei_out);
        is($pid, $pid_again, 'daemon-pid idempotent');
        like($lei_err, qr/phail/, 'got mock "phail" error previous run');
 
-       ok($lei->(qw(daemon-kill)), 'daemon-kill');
+       lei_ok(qw(daemon-kill));
        is($lei_out, '', 'no output from daemon-kill');
        is($lei_err, '', 'no error from daemon-kill');
        for (0..100) {
@@ -32,22 +32,22 @@ test_lei({ daemon_only => 1 }, sub {
        ok(-S $sock, 'sock still exists');
        ok(!kill(0, $pid), 'pid gone after stop');
 
-       ok($lei->(qw(daemon-pid)), 'daemon-pid');
+       lei_ok(qw(daemon-pid));
        chomp(my $new_pid = $lei_out);
        ok(kill(0, $new_pid), 'new pid is running');
        ok(-S $sock, 'sock still exists');
 
        for my $sig (qw(-0 -CHLD)) {
-               ok($lei->('daemon-kill', $sig), "handles $sig");
+               lei_ok('daemon-kill', $sig, \"handles $sig");
        }
        is($lei_out.$lei_err, '', 'no output on innocuous signals');
-       ok($lei->('daemon-pid'), 'daemon-pid');
+       lei_ok('daemon-pid');
        chomp $lei_out;
        is($lei_out, $new_pid, 'PID unchanged after -0/-CHLD');
 
        if ('socket inaccessible') {
                chmod 0000, $sock or BAIL_OUT "chmod 0000: $!";
-               ok($lei->('help'), 'connect fail, one-shot fallback works');
+               lei_ok('help', \'connect fail, one-shot fallback works');
                like($lei_err, qr/\bconnect\(/, 'connect error noted');
                like($lei_out, qr/^usage: /, 'help output works');
                chmod 0700, $sock or BAIL_OUT "chmod 0700: $!";