X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fhttpd-corner.t;h=5dc5734e96d1cb77028641c1ca47e0ad20afe0e8;hb=9cfb026469d5d94a0bbcbd11f6e0466db2aebfe1;hp=7a6bcc6696116c0f352fe89794cb63ac7e1b69ce;hpb=4bebfa0c80ad7f4596a7dca98b39121470a42af0;p=public-inbox.git
diff --git a/t/httpd-corner.t b/t/httpd-corner.t
index 7a6bcc66..5dc5734e 100644
--- a/t/httpd-corner.t
+++ b/t/httpd-corner.t
@@ -1,17 +1,13 @@
-# Copyright (C) 2016-2020 all contributors
+# Copyright (C) 2016-2021 all contributors
# License: AGPL-3.0+
# note: our HTTP server should be standalone and capable of running
# generic PSGI/Plack apps.
-use strict;
-use warnings;
-use Test::More;
+use strict; use v5.10.1; use PublicInbox::TestCommon;
use Time::HiRes qw(gettimeofday tv_interval);
-use PublicInbox::Spawn qw(which spawn popen_rd);
-use PublicInbox::TestCommon;
+use PublicInbox::Spawn qw(spawn popen_rd);
require_mods(qw(Plack::Util Plack::Builder HTTP::Date HTTP::Status));
use Digest::SHA qw(sha1_hex);
use IO::Handle ();
-use IO::Socket;
use IO::Socket::UNIX;
use Fcntl qw(:seek);
use Socket qw(IPPROTO_TCP TCP_NODELAY SOL_SOCKET);
@@ -50,14 +46,13 @@ sub unix_server ($) {
Listen => 1024,
Type => Socket::SOCK_STREAM(),
Local => $_[0],
- );
+ ) or BAIL_OUT "bind + listen $_[0]: $!";
$s->blocking(0);
$s;
}
my $upath = "$tmpdir/s";
my $unix = unix_server($upath);
-ok($unix, 'UNIX socket created');
my $td;
my $spawn_httpd = sub {
my (@args) = @_;
@@ -219,7 +214,7 @@ sub check_400 {
ok($u, 'unix socket connected');
$u->write("GET /host-port HTTP/1.0\r\n\r\n");
$u->read(my $buf, 4096);
- like($buf, qr!\r\n\r\n127\.0\.0\.1:0\z!,
+ like($buf, qr!\r\n\r\n127\.0\.0\.1 0\z!,
'set REMOTE_ADDR and REMOTE_PORT for Unix socket');
}
@@ -236,8 +231,8 @@ sub conn_for {
$conn->write("GET /host-port HTTP/1.0\r\n\r\n");
$conn->read(my $buf, 4096);
my ($head, $body) = split(/\r\n\r\n/, $buf);
- my ($addr, $port) = split(/:/, $body);
- is($addr, $conn->sockhost, 'host matches addr');
+ my ($addr, $port) = split(/ /, $body);
+ is($addr, (tcp_host_port($conn))[0], 'host matches addr');
is($port, $conn->sockport, 'port matches');
}
@@ -296,7 +291,7 @@ my $len = length $str;
is($len, 26, 'got the alphabet');
my $check_self = sub {
my ($conn) = @_;
- vec(my $rbits, fileno($conn), 1) = 1;
+ vec(my $rbits = '', fileno($conn), 1) = 1;
select($rbits, undef, undef, 30) or Carp::confess('timed out');
$conn->read(my $buf, 4096);
my ($head, $body) = split(/\r\n\r\n/, $buf, 2);
@@ -305,8 +300,8 @@ my $check_self = sub {
};
SKIP: {
- my $curl = which('curl') or skip('curl(1) missing', 4);
- my $base = 'http://' . $sock->sockhost . ':' . $sock->sockport;
+ my $curl = require_cmd('curl', 1) or skip('curl(1) missing', 4);
+ my $base = 'http://'.tcp_host_port($sock);
my $url = "$base/sha1";
my ($r, $w);
pipe($r, $w) or die "pipe: $!";
@@ -340,11 +335,18 @@ SKIP: {
is($n, 30 * 1024 * 1024, 'got expected output from curl');
is($non_zero, 0, 'read all zeros');
- require_mods(@zmods, 2);
+ require_mods(@zmods, 4);
my $buf = xqx([$curl, '-sS', "$base/psgi-return-gzip"]);
is($?, 0, 'curl succesful');
IO::Uncompress::Gunzip::gunzip(\$buf => \(my $out));
is($out, "hello world\n");
+ my $curl_rdr = { 2 => \(my $curl_err = '') };
+ $buf = xqx([$curl, qw(-sSv --compressed),
+ "$base/psgi-return-compressible"], undef, $curl_rdr);
+ is($?, 0, 'curl --compressed successful');
+ is($buf, "goodbye world\n", 'gzipped response as expected');
+ like($curl_err, qr/\bContent-Encoding: gzip\b/,
+ 'curl got gzipped response');
}
{
@@ -601,11 +603,12 @@ SKIP: {
SKIP: {
skip 'only testing lsof(8) output on Linux', 1 if $^O ne 'linux';
- my $lsof = which('lsof') or skip 'no lsof in PATH', 1;
+ my $lsof = require_cmd('lsof', 1) or skip 'no lsof in PATH', 1;
my $null_in = '';
my $rdr = { 2 => \(my $null_err), 0 => \$null_in };
my @lsof = xqx([$lsof, '-p', $td->{pid}], undef, $rdr);
- is_deeply([grep(/\bdeleted\b/, @lsof)], [], 'no lingering deleted inputs');
+ my $d = [ grep(/\(deleted\)/, @lsof) ];
+ is_deeply($d, [], 'no lingering deleted inputs') or diag explain($d);
# filter out pipes inherited from the parent
my @this = xqx([$lsof, '-p', $$], undef, $rdr);