Merge remote-tracking branch 'origin/danga-bundle'

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

diff --git a/t/httpd-unix.t b/t/httpd-unix.t
index 13df676b5fcf361a60493acfbf6aa9b440981ea2..627adfafe0cad8f58cc0aa4dd8532c406bbb357e 100644 (file)
--- a/t/httpd-unix.t
+++ b/t/httpd-unix.t
@@ -1,12 +1,12 @@
-# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2018 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 # Tests for binding Unix domain sockets
 use strict;
 use warnings;
 use Test::More;
 
-foreach my $mod (qw(Plack::Util Plack::Request Plack::Builder Danga::Socket
-                       HTTP::Parser::XS HTTP::Date HTTP::Status)) {
+foreach my $mod (qw(Plack::Util Plack::Builder PublicInbox::DS
+                       HTTP::Date HTTP::Status)) {
        eval "require $mod";
        plan skip_all => "$mod missing for httpd-unix.t" if $@;
 }
@@ -14,7 +14,6 @@ foreach my $mod (qw(Plack::Util Plack::Request Plack::Builder Danga::Socket
 use File::Temp qw/tempdir/;
 use IO::Socket::UNIX;
 use Cwd qw/getcwd/;
-use Fcntl qw(FD_CLOEXEC F_SETFD F_GETFD :seek);
 my $tmpdir = tempdir('httpd-unix-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 my $unix = "$tmpdir/unix.sock";
 my $httpd = 'blib/script/public-inbox-httpd';
@@ -54,6 +53,7 @@ ok(-S $unix, 'UNIX socket was bound by -httpd');
 sub check_sock ($) {
        my ($unix) = @_;
        my $sock = IO::Socket::UNIX->new(Peer => $unix, Type => SOCK_STREAM);
+       warn "E: $! connecting to $unix\n" unless defined $sock;
        ok($sock, 'client UNIX socket connected');
        ok($sock->write("GET /host-port HTTP/1.0\r\n\r\n"),
                'wrote req to server');
@@ -103,6 +103,7 @@ SKIP: {
 
        ok(-f "$tmpdir/pid", 'pid file written');
        open my $fh, '<', "$tmpdir/pid" or die "open failed: $!";
+       local $/ = "\n";
        my $rpid = <$fh>;
        chomp $rpid;
        like($rpid, qr/\A\d+\z/s, 'pid file looks like a pid');