get rid of unnecessary bytes::length usage

[public-inbox.git] / lib / PublicInbox / TestCommon.pm

diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index 2627871a3c3f202f5c3d0eab75ee3ae42a9c694f..83dcf650d9c915e5357725b6bb23fe8f5e259756 100644 (file)
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -12,6 +12,7 @@ use IO::Socket::INET;
 use File::Spec;
 our @EXPORT;
 my $lei_loud = $ENV{TEST_LEI_ERR_LOUD};
+our ($lei_opt, $lei_out, $lei_err, $lei_cwdfh);
 BEGIN {
        @EXPORT = qw(tmpdir tcp_server tcp_connect require_git require_mods
                run_script start_script key2sub xsys xsys_e xqx eml_load tick
@@ -25,7 +26,7 @@ BEGIN {
        push @EXPORT, @methods;
 }
 
-sub xbail (@) { BAIL_OUT join(' ', map { ref ? (explain($_)) : ($_) } @_) }
+sub xbail (@) { BAIL_OUT join(' ', map { ref() ? (explain($_)) : ($_) } @_) }
 
 sub eml_load ($) {
        my ($path, $cb) = @_;
@@ -306,14 +307,16 @@ sub run_script ($;$$) {
                local %SIG = %SIG;
                local $0 = join(' ', @$cmd);
                my $orig_io = _prepare_redirects($fhref);
-               my $cwdfh;
+               my $cwdfh = $lei_cwdfh;
                if (my $d = $opt->{'-C'}) {
-                       opendir $cwdfh, '.' or die "opendir .: $!";
+                       unless ($cwdfh) {
+                               opendir $cwdfh, '.' or die "opendir .: $!";
+                       }
                        chdir $d or die "chdir $d: $!";
                }
                _run_sub($sub, $key, \@argv);
                eval { PublicInbox::Inbox::cleanup_task() };
-               die "chdir(restore): $!" if $cwdfh && !chdir($cwdfh);
+               die "fchdir(restore): $!" if $cwdfh && !chdir($cwdfh);
                _undo_redirects($orig_io);
                select STDOUT;
        }
@@ -321,6 +324,7 @@ sub run_script ($;$$) {
        # slurp the redirects back into user-supplied strings
        for my $fd (1..2) {
                my $fh = $fhref->[$fd] or next;
+               next unless -f $fh;
                seek($fh, 0, SEEK_SET) or die "seek: $!";
                my $redir = $opt->{$fd};
                local $/;
@@ -468,7 +472,6 @@ sub have_xapian_compact () {
        PublicInbox::Spawn::which($ENV{XAPIAN_COMPACT} || 'xapian-compact');
 }
 
-our ($err_skip, $lei_opt, $lei_out, $lei_err);
 # favor lei() or lei_ok() over $lei for new code
 sub lei (@) {
        my ($cmd, $env, $xopt) = @_;
@@ -478,8 +481,6 @@ sub lei (@) {
                $cmd = [ grep { defined && !ref } @_ ];
        }
        my $res = run_script(['lei', @$cmd], $env, $xopt // $lei_opt);
-       $err_skip and
-               $lei_err = join('', grep(!/$err_skip/, split(/^/m, $lei_err)));
        if ($lei_err ne '') {
                if ($lei_err =~ /Use of uninitialized/ ||
                        $lei_err =~ m!\bArgument .*? isn't numeric in !) {
@@ -516,9 +517,12 @@ sub test_lei {
 SKIP: {
        my ($cb) = pop @_;
        my $test_opt = shift // {};
+       local $lei_cwdfh;
+       opendir $lei_cwdfh, '.' or xbail "opendir .: $!";
        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};
@@ -536,10 +540,12 @@ 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: {
-               skip 'TEST_LEI_ONESHOT set', 1 if $ENV{TEST_LEI_ONESHOT};
+               $ENV{TEST_LEI_ONESHOT} and
+                       xbail 'TEST_LEI_ONESHOT no longer supported';
                my $home = "$tmpdir/lei-daemon";
                mkdir($home, 0700) or BAIL_OUT "mkdir: $!";
                local $ENV{HOME} = $home;
@@ -563,25 +569,12 @@ EOM
                        lei_ok(qw(daemon-kill), \"daemon-kill after $t");
                }
        }; # SKIP for lei_daemon
-       unless ($test_opt->{daemon_only}) {
-               $ENV{TEST_LEI_DAEMON_ONLY} and
-                       skip 'TEST_LEI_DAEMON_ONLY set', 1;
-               require_ok 'PublicInbox::LEI';
-               my $home = "$tmpdir/lei-oneshot";
-               mkdir($home, 0700) or BAIL_OUT "mkdir: $!";
-               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 $ENV{XDG_RUNTIME_DIR} = $xrd;
-               $cb->();
-       }
        if ($daemon_pid) {
                for (0..10) {
                        kill(0, $daemon_pid) or last;
                        tick;
                }
-               ok(!kill(0, $daemon_pid), "$t daemon stopped after oneshot");
+               ok(!kill(0, $daemon_pid), "$t daemon stopped");
                my $f = "$daemon_xrd/lei/errors.log";
                open my $fh, '<', $f or BAIL_OUT "$f: $!";
                my @l = <$fh>;