mda: hoist out mda_filter_adjust

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

diff --git a/t/httpd-corner.t b/t/httpd-corner.t
index 1cfc2565c09fd3c3aa7056cd50473ffef5f77ce8..4077a6d1a44bdb308dbacdaef2b5c7f7c2fcbef9 100644 (file)
--- a/t/httpd-corner.t
+++ b/t/httpd-corner.t
@@ -6,6 +6,7 @@ use strict;
 use warnings;
 use Test::More;
 use Time::HiRes qw(gettimeofday tv_interval);
+use PublicInbox::Spawn qw(which);
 
 foreach my $mod (qw(Plack::Util Plack::Builder
                        HTTP::Date HTTP::Status IPC::Run)) {
@@ -28,14 +29,10 @@ 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 stdin is not a pipe for lsof test to check for leaking pipes
+open(STDIN, '<', '/dev/null') or die 'no /dev/null: $!';
 
 # Make sure we don't clobber socket options set by systemd or similar
 # using socket activation:
@@ -56,11 +53,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 };
@@ -168,14 +161,9 @@ SKIP: {
 }
 
 sub conn_for {
-       my ($sock, $msg) = @_;
-       my $conn = IO::Socket::INET->new(
-                               PeerAddr => $sock->sockhost,
-                               PeerPort => $sock->sockport,
-                               Proto => 'tcp',
-                               Type => SOCK_STREAM);
+       my ($dest, $msg) = @_;
+       my $conn = tcp_connect($dest);
        ok($conn, "connected for $msg");
-       $conn->autoflush(1);
        setsockopt($conn, IPPROTO_TCP, TCP_NODELAY, 1);
        return $conn;
 }
@@ -256,15 +244,9 @@ my $check_self = sub {
 };
 
 SKIP: {
-       my $have_curl = 0;
-       foreach my $p (split(':', $ENV{PATH})) {
-               -x "$p/curl" or next;
-               $have_curl = 1;
-               last;
-       }
-       my $ntest = 2;
-       $have_curl or skip('curl(1) missing', $ntest);
-       my $url = 'http://' . $sock->sockhost . ':' . $sock->sockport . '/sha1';
+       which('curl') or skip('curl(1) missing', 4);
+       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 +263,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');
 }
 
 {
@@ -530,6 +523,13 @@ SKIP: {
        defined(my $x = getsockopt($sock, SOL_SOCKET, $var)) or die;
        is($x, $accf_arg, 'SO_ACCEPTFILTER unchanged if previously set');
 };
+SKIP: {
+       skip 'only testing lsof(8) output on Linux', 1 if $^O ne 'linux';
+       skip 'no lsof in PATH', 1 unless which('lsof');
+       my @lsof = `lsof -p $pid`;
+       is_deeply([grep(/\bdeleted\b/, @lsof)], [], 'no lingering deleted inputs');
+       is_deeply([grep(/\bpipe\b/, @lsof)], [], 'no extra pipes with -W0');
+};
 
 done_testing();