treewide: shorten temporary filename

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

diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index d4117b6cb298bf1eee6daba9b4d9e55d80747f12..d6e090dd14b3780b855b5afbdd2380559063bcc2 100644 (file)
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -11,12 +11,13 @@ use POSIX qw(dup2);
 use IO::Socket::INET;
 use File::Spec;
 our @EXPORT;
+my $lei_loud = $ENV{TEST_LEI_ERR_LOUD};
 BEGIN {
        @EXPORT = qw(tmpdir tcp_server tcp_connect require_git require_mods
                run_script start_script key2sub xsys xsys_e xqx eml_load tick
                have_xapian_compact json_utf8 setup_public_inboxes create_inbox
                tcp_host_port test_lei lei lei_ok $lei_out $lei_err $lei_opt
-               test_httpd);
+               test_httpd xbail);
        require Test::More;
        my @methods = grep(!/\W/, @Test::More::EXPORT);
        eval(join('', map { "*$_=\\&Test::More::$_;" } @methods));
@@ -24,6 +25,8 @@ BEGIN {
        push @EXPORT, @methods;
 }
 
+sub xbail (@) { BAIL_OUT join(' ', map { ref ? (explain($_)) : ($_) } @_) }
+
 sub eml_load ($) {
        my ($path, $cb) = @_;
        open(my $fh, '<', $path) or die "open $path: $!";
@@ -37,7 +40,7 @@ sub tmpdir (;$) {
        unless (defined $base) {
                ($base) = ($0 =~ m!\b([^/]+)\.[^\.]+\z!);
        }
-       my $tmpdir = File::Temp->newdir("pi-$base-$$-XXXXXX", TMPDIR => 1);
+       my $tmpdir = File::Temp->newdir("pi-$base-$$-XXXX", TMPDIR => 1);
        ($tmpdir->dirname, $tmpdir);
 }
 
@@ -104,20 +107,29 @@ sub require_mods {
        my $maybe = pop @mods if $mods[-1] =~ /\A[0-9]+\z/;
        my @need;
        while (my $mod = shift(@mods)) {
+               if ($mod eq 'lei') {
+                       require_git(2.6, $maybe ? $maybe : ());
+                       push @mods, qw(DBD::SQLite Search::Xapian);
+                       $mod = 'json'; # fall-through
+               }
                if ($mod eq 'json') {
-                       $mod = 'Cpanel::JSON::XS||JSON::MaybeXS||'.
-                               'JSON||JSON::PP'
+                       $mod = 'Cpanel::JSON::XS||JSON::MaybeXS||JSON||JSON::PP'
+               } elsif ($mod eq '-httpd') {
+                       push @mods, qw(Plack::Builder Plack::Util);
+                       next;
+               } elsif ($mod eq '-imapd') {
+                       push @mods, qw(Parse::RecDescent DBD::SQLite
+                                       Email::Address::XS||Mail::Address);
+                       next;
+               } elsif ($mod eq '-nntpd') {
+                       push @mods, qw(DBD::SQLite);
+                       next;
                }
                if ($mod eq 'Search::Xapian') {
                        if (eval { require PublicInbox::Search } &&
                                PublicInbox::Search::load_xapian()) {
                                next;
                        }
-               } elsif ($mod eq 'Search::Xapian::WritableDatabase') {
-                       if (eval { require PublicInbox::SearchIdx } &&
-                               PublicInbox::SearchIdx::load_xapian_writable()){
-                                       next;
-                       }
                } elsif (index($mod, '||') >= 0) { # "Foo||Bar"
                        my $ok;
                        for my $m (split(/\Q||\E/, $mod)) {
@@ -291,6 +303,7 @@ sub run_script ($;$$) {
                local $0 = join(' ', @$cmd);
                my $orig_io = _prepare_redirects($fhref);
                _run_sub($sub, $key, \@argv);
+               eval { PublicInbox::Inbox::cleanup_task() };
                _undo_redirects($orig_io);
                select STDOUT;
        }
@@ -462,21 +475,24 @@ sub lei (@) {
                        $lei_err =~ m!\bArgument .*? isn't numeric in !) {
                        fail "lei_err=$lei_err";
                } else {
-                       state $loud = $ENV{TEST_LEI_ERR_LOUD};
-                       diag "lei_err=$lei_err" if $loud;
+                       diag "lei_err=$lei_err" if $lei_loud;
                }
        }
        $res;
 };
 
 sub lei_ok (@) {
+       state $PWD = $ENV{PWD} // Cwd::getcwd();
        my $msg = ref($_[-1]) eq 'SCALAR' ? pop(@_) : undef;
        my $tmpdir = quotemeta(File::Spec->tmpdir);
        # filter out anything that looks like a path name for consistent logs
        my @msg = ref($_[0]) eq 'ARRAY' ? @{$_[0]} : @_;
-       for (@msg) {
-               s!\A([a-z0-9]+://)[^/]+/!$1\$HOST_PORT/! ||
-                       s!$tmpdir\b/(?:[^/]+/)?!\$TMPDIR/!;
+       if (!$lei_loud) {
+               for (@msg) {
+                       s!\A([a-z0-9]+://)[^/]+/!$1\$HOST_PORT/!;
+                       s!$tmpdir\b/(?:[^/]+/)?!\$TMPDIR/!g;
+                       s!\Q$PWD\E\b!\$PWD!g;
+               }
        }
        ok(lei(@_), "lei @msg". ($msg ? " ($$msg)" : '')) or diag $lei_err;
 }
@@ -510,22 +526,30 @@ EOM
        my ($daemon_pid, $for_destroy, $daemon_xrd);
        my $tmpdir = $test_opt->{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};
                my $home = "$tmpdir/lei-daemon";
                mkdir($home, 0700) or BAIL_OUT "mkdir: $!";
                local $ENV{HOME} = $home;
-               $daemon_xrd = "$home/xdg_run";
-               mkdir($daemon_xrd, 0700) or BAIL_OUT "mkdir: $!";
+               my $persist;
+               if ($persist_xrd && !$test_opt->{daemon_only}) {
+                       $persist = $daemon_xrd = $persist_xrd;
+               } else {
+                       $daemon_xrd = "$home/xdg_run";
+                       mkdir($daemon_xrd, 0700) or BAIL_OUT "mkdir: $!";
+               }
                local $ENV{XDG_RUNTIME_DIR} = $daemon_xrd;
                $cb->();
-               lei_ok(qw(daemon-pid), \"daemon-pid after $t");
-               chomp($daemon_pid = $lei_out);
-               if ($daemon_pid) {
+               unless ($persist) {
+                       lei_ok(qw(daemon-pid), \"daemon-pid after $t");
+                       chomp($daemon_pid = $lei_out);
+                       if (!$daemon_pid) {
+                               fail("daemon not running after $t");
+                               skip 'daemon died unexpectedly', 2;
+                       }
                        ok(kill(0, $daemon_pid), "daemon running after $t");
                        lei_ok(qw(daemon-kill), \"daemon-kill after $t");
-               } else {
-                       fail("daemon not running after $t");
                }
        }; # SKIP for lei_daemon
        unless ($test_opt->{daemon_only}) {