X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=xt%2Fgit-http-backend.t;h=adadebb0a15ab7926923d736d5ea34c1282262c2;hb=refs%2Fheads%2Fmaster;hp=2f02725a69988e316a6c4a5be7550099df20297d;hpb=6e07def560b211d9a1a3221862e72b7aeb4a31b3;p=public-inbox.git
diff --git a/xt/git-http-backend.t b/xt/git-http-backend.t
index 2f02725a..d78fe79f 100644
--- a/xt/git-http-backend.t
+++ b/xt/git-http-backend.t
@@ -1,14 +1,13 @@
-# Copyright (C) 2016-2020 all contributors
+#!perl -w
+# Copyright (C) all contributors
# License: AGPL-3.0+
#
# Ensure buffering behavior in -httpd doesn't cause runaway memory use
# or data corruption
use strict;
-use warnings;
-use Test::More;
+use v5.10.1;
use POSIX qw(setsid);
use PublicInbox::TestCommon;
-use PublicInbox::Spawn qw(which);
my $git_dir = $ENV{GIANT_GIT_DIR};
plan 'skip_all' => 'GIANT_GIT_DIR not defined' unless $git_dir;
@@ -19,8 +18,7 @@ my ($tmpdir, $for_destroy) = tmpdir();
my $err = "$tmpdir/stderr.log";
my $out = "$tmpdir/stdout.log";
my $sock = tcp_server();
-my $host = $sock->sockhost;
-my $port = $sock->sockport;
+my ($host, $port) = tcp_host_port($sock);
my $td;
my $get_maxrss = sub {
@@ -37,7 +35,6 @@ my $get_maxrss = sub {
};
{
- ok($sock, 'sock created');
my $cmd = [ '-httpd', '-W0', "--stdout=$out", "--stderr=$err", $psgi ];
$td = start_script($cmd, undef, { 3 => $sock });
}
@@ -55,7 +52,7 @@ SKIP: {
}
}
skip "no packs found in $git_dir" unless defined $pack;
- if ($pack !~ m!(/objects/pack/pack-[a-f0-9]{40}.pack)\z!) {
+ if ($pack !~ m!(/objects/pack/pack-[a-f0-9]{40,64}.pack)\z!) {
skip "bad pack name: $pack";
}
my $url = $1;
@@ -79,8 +76,7 @@ SKIP: { # make sure Last-Modified + If-Modified-Since works with curl
my $nr = 6;
skip 'no description', $nr unless -f "$git_dir/description";
my $mtime = (stat(_))[9];
- my $curl = which('curl');
- skip 'curl(1) not found', $nr unless $curl;
+ my $curl = require_cmd('curl', 1) or skip 'curl(1) not found', $nr;
my $url = "http://$host:$port/description";
my $dst = "$tmpdir/desc";
is(xsys($curl, qw(-RsSf), '-o', $dst, $url), 0, 'curl -R');