imap+nntp: share COMPRESS implementation

[public-inbox.git] / xt / git-http-backend.t

diff --git a/xt/git-http-backend.t b/xt/git-http-backend.t
index 7f34d45213f69db4f227984bd97ab97a345821b8..adadebb0a15ab7926923d736d5ea34c1282262c2 100644 (file)
--- a/xt/git-http-backend.t
+++ b/xt/git-http-backend.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Ensure buffering behavior in -httpd doesn't cause runaway memory use
@@ -19,8 +19,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 +36,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 });
 }
@@ -83,13 +81,13 @@ SKIP: { # make sure Last-Modified + If-Modified-Since works with curl
        skip 'curl(1) not found', $nr unless $curl;
        my $url = "http://$host:$port/description";
        my $dst = "$tmpdir/desc";
-       is(system($curl, qw(-RsSf), '-o', $dst, $url), 0, 'curl -R');
+       is(xsys($curl, qw(-RsSf), '-o', $dst, $url), 0, 'curl -R');
        is((stat($dst))[9], $mtime, 'curl used remote mtime');
-       is(system($curl, qw(-sSf), '-z', $dst, '-o', "$dst.2", $url), 0,
+       is(xsys($curl, qw(-sSf), '-z', $dst, '-o', "$dst.2", $url), 0,
                'curl -z noop');
        ok(!-e "$dst.2", 'no modification, nothing retrieved');
        utime(0, 0, $dst) or die "utime failed: $!";
-       is(system($curl, qw(-sSfR), '-z', $dst, '-o', "$dst.2", $url), 0,
+       is(xsys($curl, qw(-sSfR), '-z', $dst, '-o', "$dst.2", $url), 0,
                'curl -z updates');
        ok(-e "$dst.2", 'faked modification, got new file retrieved');
 }