extindex: add some validation and config knobs for WWW

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

diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index 6ca691746fa55a40842740ecc3b8670467ebf548..0d15514e2cb6f2859ab2296515fa82d9e05d2574 100644 (file)
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -15,7 +15,8 @@ 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);
+               tcp_host_port test_lei lei lei_ok $lei_out $lei_err $lei_opt
+               test_httpd);
        require Test::More;
        my @methods = grep(!/\W/, @Test::More::EXPORT);
        eval(join('', map { "*$_=\\&Test::More::$_;" } @methods));
@@ -593,13 +594,17 @@ sub create_inbox ($$;@) {
        require PublicInbox::InboxWritable;
        my ($base) = ($0 =~ m!\b([^/]+)\.[^\.]+\z!);
        my $dir = "t/data-gen/$base.$ident";
-       unless (-d $dir) {
+       my $new = !-d $dir;
+       if ($new) {
                mkdir $dir; # may race
                -d $dir or BAIL_OUT "$dir could not be created: $!";
        }
        my $lk = bless { lock_path => "$dir/creat.lock" }, 'PublicInbox::Lock';
        $opt{inboxdir} = File::Spec->rel2abs($dir);
        $opt{name} //= $ident;
+       my $scope = $lk->lock_for_scope;
+       my $pre_cb = delete $opt{pre_cb};
+       $pre_cb->($dir) if $pre_cb && $new;
        $opt{-no_fsync} = 1;
        my $no_gc = delete $opt{-no_gc};
        my $tmpdir = delete $opt{tmpdir};
@@ -608,7 +613,6 @@ sub create_inbox ($$;@) {
        my $parallel = delete($opt{importer_parallel}) // 0;
        my $creat_opt = { nproc => delete($opt{nproc}) // 1 };
        my $ibx = PublicInbox::InboxWritable->new({ %opt }, $creat_opt);
-       my $scope = $lk->lock_for_scope;
        if (!-f "$dir/creat.stamp") {
                my $im = $ibx->importer($parallel);
                $cb->($im, $ibx);
@@ -633,6 +637,31 @@ sub create_inbox ($$;@) {
        $ibx;
 }
 
+sub test_httpd ($$;$) {
+       my ($env, $client, $skip) = @_;
+       for (qw(PI_CONFIG TMPDIR)) {
+               $env->{$_} or BAIL_OUT "$_ unset";
+       }
+       SKIP: {
+               require_mods(qw(Plack::Test::ExternalServer), $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);
+               $td->join('TERM');
+               open my $fh, '<', $err or BAIL_OUT $!;
+               my $e = do { local $/; <$fh> };
+               if ($e =~ s/^Plack::Middleware::ReverseProxy missing,\n//gms) {
+                       $e =~ s/^URL generation for redirects .*\n//gms;
+               }
+               is($e, '', 'no errors');
+       }
+};
+
+
 package PublicInboxTestProcess;
 use strict;