tests: use test_httpd consistently

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

diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index 052d6e45e45b498809ec2a79cbc0731c66d78918..abf4f3642b00c0fa57ef5163c8d2676cc6d35d53 100644 (file)
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # internal APIs used only for tests
@@ -19,7 +19,8 @@ BEGIN {
                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 xbail require_cmd is_xdeeply tail_f);
+               test_httpd xbail require_cmd is_xdeeply tail_f
+               ignore_inline_c_missing);
        require Test::More;
        my @methods = grep(!/\W/, @Test::More::EXPORT);
        eval(join('', map { "*$_=\\&Test::More::$_;" } @methods));
@@ -116,6 +117,12 @@ sub require_git ($;$) {
        1;
 }
 
+my %IPv6_VERSION = (
+       'Net::NNTP' => 3.00,
+       'Mail::IMAPClient' => 3.40,
+       'HTTP::Tiny' => 0.042,
+);
+
 sub require_mods {
        my @mods = @_;
        my $maybe = pop @mods if $mods[-1] =~ /\A[0-9]+\z/;
@@ -135,7 +142,7 @@ sub require_mods {
                        push @mods, qw(Parse::RecDescent DBD::SQLite
                                        Email::Address::XS||Mail::Address);
                        next;
-               } elsif ($mod eq '-nntpd') {
+               } elsif ($mod eq '-nntpd' || $mod eq 'v2') {
                        push @mods, qw(DBD::SQLite);
                        next;
                }
@@ -166,6 +173,9 @@ sub require_mods {
                                !eval{ IO::Socket::SSL->VERSION(2.007); 1 }) {
                        push @need, $@;
                }
+               if (defined(my $v = $IPv6_VERSION{$mod})) {
+                       $ENV{TEST_IPV4_ONLY} = 1 if !eval { $mod->VERSION($v) };
+               }
        }
        return unless @need;
        my $m = join(', ', @need)." missing for $0";
@@ -377,7 +387,7 @@ sub wait_for_tail {
                my @ino;
                do {
                        @ino = grep {
-                               readlink($_) =~ /\binotify\b/
+                               (readlink($_) // '') =~ /\binotify\b/
                        } glob("/proc/$tail_pid/fd/*");
                } while (!@ino && time <= $end and tick);
                return if !@ino;
@@ -547,6 +557,11 @@ sub is_xdeeply ($$$) {
        $ok;
 }
 
+sub ignore_inline_c_missing {
+       $_[0] = join('', grep(/\S/, grep(!/compilation aborted/,
+               grep(!/\bInline\b/, split(/^/m, $_[0])))));
+}
+
 sub test_lei {
 SKIP: {
        my ($cb) = pop @_;
@@ -568,10 +583,13 @@ SKIP: {
        delete $ENV{XDG_CACHE_HOME};
        $ENV{GIT_COMMITTER_EMAIL} = 'lei@example.com';
        $ENV{GIT_COMMITTER_NAME} = 'lei user';
+       $ENV{LANG} = $ENV{LC_ALL} = 'C';
        my (undef, $fn, $lineno) = caller(0);
        my $t = "$fn:$lineno";
-       state $lei_daemon = PublicInbox::Spawn->can('send_cmd4') ||
-                               eval { require Socket::MsgHdr; 1 };
+       state $lei_daemon = PublicInbox::Spawn->can('send_cmd4') || do {
+                       require PublicInbox::Syscall;
+                       PublicInbox::Syscall->can('send_cmd4');
+               } || eval { require Socket::MsgHdr; 1 };
        unless ($lei_daemon) {
                skip('Inline::C unconfigured/missing '.
 '(mkdir -p ~/.cache/public-inbox/inline-c) OR Socket::MsgHdr missing',
@@ -725,20 +743,28 @@ sub create_inbox ($$;@) {
        $ibx;
 }
 
-sub test_httpd ($$;$) {
-       my ($env, $client, $skip) = @_;
-       for (qw(PI_CONFIG TMPDIR)) {
-               $env->{$_} or BAIL_OUT "$_ unset";
-       }
+sub test_httpd ($$;$$) {
+       my ($env, $client, $skip, $cb) = @_;
+       my ($tmpdir, $for_destroy);
+       $env->{TMPDIR} //= do {
+               ($tmpdir, $for_destroy) = tmpdir();
+               $tmpdir;
+       };
+       for (qw(PI_CONFIG)) { $env->{$_} or BAIL_OUT "$_ unset" }
        SKIP: {
-               require_mods(qw(Plack::Test::ExternalServer), $skip // 1);
+               require_mods(qw(Plack::Test::ExternalServer LWP::UserAgent),
+                               $skip // 1);
                my $sock = tcp_server() or die;
                my ($out, $err) = map { "$env->{TMPDIR}/std$_.log" } qw(out err);
                my $cmd = [ qw(-httpd -W0), "--stdout=$out", "--stderr=$err" ];
                my $td = start_script($cmd, $env, { 3 => $sock });
                my ($h, $p) = tcp_host_port($sock);
                local $ENV{PLACK_TEST_EXTERNALSERVER_URI} = "http://$h:$p";
-               Plack::Test::ExternalServer::test_psgi(client => $client);
+               my $ua = LWP::UserAgent->new;
+               $ua->max_redirect(0);
+               Plack::Test::ExternalServer::test_psgi(client => $client,
+                                                       ua => $ua);
+               $cb->() if $cb;
                $td->join('TERM');
                open my $fh, '<', $err or BAIL_OUT $!;
                my $e = do { local $/; <$fh> };