From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id D57AC1F66F for ; Wed, 9 Sep 2020 06:26:18 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 01/11] xt/solver: test with public-inbox-httpd, too Date: Wed, 9 Sep 2020 06:26:08 +0000 Message-Id: <20200909062618.5940-2-e@80x24.org> In-Reply-To: <20200909062618.5940-1-e@80x24.org> References: <20200909062618.5940-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: We'll be making changes to solver to make it even fairer to slow clients on slow storage. Ensure we test with public-inbox-httpd-specific codepaths, since the generic PSGI code paths are rare in production use. --- xt/solver.t | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/xt/solver.t b/xt/solver.t index d2206b28..99fca0d3 100644 --- a/xt/solver.t +++ b/xt/solver.t @@ -33,11 +33,11 @@ my $todo = { ], }; -my ($ibx, $urls); +my ($ibx_name, $urls, @gone); my $client = sub { my ($cb) = @_; for (@$urls) { - my $url = "/$ibx/$_"; + my $url = "/$ibx_name/$_"; my $res = $cb->(GET($url)); is($res->code, 200, $url); next if $res->code == 200; @@ -46,14 +46,33 @@ my $client = sub { } }; -while (($ibx, $urls) = each %$todo) { +my $nr = 0; +while (($ibx_name, $urls) = each %$todo) { SKIP: { - if (!$cfg->lookup_name($ibx)) { - skip("$ibx not configured", scalar(@$urls)); + if (!$cfg->lookup_name($ibx_name)) { + push @gone, $ibx_name; + skip("$ibx_name not configured", scalar(@$urls)); } test_psgi($app, $client); + $nr++; + } +} + +SKIP: { + require_mods(qw(Plack::Test::ExternalServer), $nr); + delete @$todo{@gone}; + + my $sock = tcp_server() or BAIL_OUT $!; + my ($tmpdir, $for_destroy) = tmpdir(); + my ($out, $err) = map { "$tmpdir/std$_.log" } qw(out err); + my $cmd = [ qw(-httpd -W0), "--stdout=$out", "--stderr=$err" ]; + my $td = start_script($cmd, undef, { 3 => $sock }); + my ($h, $p) = ($sock->sockhost, $sock->sockport); + + local $ENV{PLACK_TEST_EXTERNALSERVER_URI} = "http://$h:$p"; + while (($ibx_name, $urls) = each %$todo) { + Plack::Test::ExternalServer::test_psgi(client => $client); } } done_testing(); -1;