Merge remote-tracking branch 'origin/nntp-compress'

[public-inbox.git] / t / httpd-corner.t

diff --git a/t/httpd-corner.t b/t/httpd-corner.t
index 1cfc2565c09fd3c3aa7056cd50473ffef5f77ce8..35318b501f6dfd3f237f796d7e5f5ec031dc020f 100644 (file)
--- a/t/httpd-corner.t
+++ b/t/httpd-corner.t
@@ -28,14 +28,7 @@ my $err = "$tmpdir/stderr.log";
 my $out = "$tmpdir/stdout.log";
 my $httpd = 'blib/script/public-inbox-httpd';
 my $psgi = "./t/httpd-corner.psgi";
-my %opts = (
-       LocalAddr => '127.0.0.1',
-       ReuseAddr => 1,
-       Proto => 'tcp',
-       Type => SOCK_STREAM,
-       Listen => 1024,
-);
-my $sock = IO::Socket::INET->new(%opts);
+my $sock = tcp_server();
 
 # Make sure we don't clobber socket options set by systemd or similar
 # using socket activation:
@@ -56,11 +49,7 @@ if ($^O eq 'linux') {
 }
 
 my $upath = "$tmpdir/s";
-my $unix = IO::Socket::UNIX->new(
-       Listen => 1024,
-       Type => SOCK_STREAM,
-       Local => $upath
-);
+my $unix = unix_server($upath);
 ok($unix, 'UNIX socket created');
 my $pid;
 END { kill 'TERM', $pid if defined $pid };
@@ -262,9 +251,10 @@ SKIP: {
                $have_curl = 1;
                last;
        }
-       my $ntest = 2;
+       my $ntest = 4;
        $have_curl or skip('curl(1) missing', $ntest);
-       my $url = 'http://' . $sock->sockhost . ':' . $sock->sockport . '/sha1';
+       my $base = 'http://' . $sock->sockhost . ':' . $sock->sockport;
+       my $url = "$base/sha1";
        my ($r, $w);
        pipe($r, $w) or die "pipe: $!";
        my $cmd = [qw(curl --tcp-nodelay --no-buffer -T- -HExpect: -sS), $url];
@@ -281,6 +271,17 @@ SKIP: {
        is($?, 0, 'curl exited successfully');
        is($err, '', 'no errors from curl');
        is($out, sha1_hex($str), 'read expected body');
+
+       open my $fh, '-|', qw(curl -sS), "$base/async-big" or die $!;
+       my $n = 0;
+       my $non_zero = 0;
+       while (1) {
+               my $r = sysread($fh, my $buf, 4096) or last;
+               $n += $r;
+               $buf =~ /\A\0+\z/ or $non_zero++;
+       }
+       is($n, 30 * 1024 * 1024, 'got expected output from curl');
+       is($non_zero, 0, 'read all zeros');
 }
 
 {