viewvcs: add path name hint based on `b=' query param

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

diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index 04adede054e30a9005286495a7c941c54c78fc5f..b36c71a64cded042ea4d81449359ccbb5454fc93 100644 (file)
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -6,7 +6,7 @@ package PublicInbox::TestCommon;
 use strict;
 use parent qw(Exporter);
 use v5.10.1;
-use Fcntl qw(FD_CLOEXEC F_SETFD F_GETFD :seek);
+use Fcntl qw(F_SETFD :seek);
 use POSIX qw(dup2);
 use IO::Socket::INET;
 use File::Spec;
@@ -14,6 +14,9 @@ our @EXPORT;
 my $lei_loud = $ENV{TEST_LEI_ERR_LOUD};
 my $tail_cmd = $ENV{TAIL};
 our ($lei_opt, $lei_out, $lei_err, $lei_cwdfh);
+
+$_ = File::Spec->rel2abs($_) for (grep(!m!^/!, @INC));
+
 BEGIN {
        @EXPORT = qw(tmpdir tcp_server tcp_connect require_git require_mods
                run_script start_script key2sub xsys xsys_e xqx eml_load tick
@@ -117,6 +120,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/;
@@ -167,6 +176,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";
@@ -279,6 +291,7 @@ sub run_script ($;$$) {
        my ($cmd, $env, $opt) = @_;
        my ($key, @argv) = @$cmd;
        my $run_mode = $ENV{TEST_RUN_MODE} // $opt->{run_mode} // 1;
+       $run_mode = 0 if $key eq '-clone'; # relies on SIGCHLD + waitpid(-1)
        my $sub = $run_mode == 0 ? undef : key2sub($key);
        my $fhref = [];
        my $spawn_opt = {};
@@ -466,16 +479,14 @@ sub start_script {
                # pretend to be systemd (cf. sd_listen_fds(3))
                # 3 == SD_LISTEN_FDS_START
                my $fd;
-               for ($fd = 0; 1; $fd++) {
-                       my $s = $opt->{$fd};
-                       last if $fd >= 3 && !defined($s);
-                       next unless $s;
-                       my $fl = fcntl($s, F_GETFD, 0);
-                       if (($fl & FD_CLOEXEC) != FD_CLOEXEC) {
-                               warn "got FD:".fileno($s)." w/o CLOEXEC\n";
+               for ($fd = 0; $fd < 3 || defined($opt->{$fd}); $fd++) {
+                       my $io = $opt->{$fd} // next;
+                       my $old = fileno($io);
+                       if ($old == $fd) {
+                               fcntl($io, F_SETFD, 0) // die "F_SETFD: $!";
+                       } else {
+                               dup2($old, $fd) // die "dup2($old, $fd): $!";
                        }
-                       fcntl($s, F_SETFD, $fl &= ~FD_CLOEXEC);
-                       dup2(fileno($s), $fd) or die "dup2 failed: $!\n";
                }
                %ENV = (%ENV, %$env) if $env;
                my $fds = $fd - 3;
@@ -734,20 +745,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> };