v2writable: move git->cleanup to the correct place

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

diff --git a/t/httpd-unix.t b/t/httpd-unix.t
index b3368491b14bb892efa813e790999fff92155486..d0c70a72c65f92149b3eed8116ea21dfa6e30f11 100644 (file)
--- a/t/httpd-unix.t
+++ b/t/httpd-unix.t
@@ -1,24 +1,21 @@
-# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2019 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 HTTP::Date HTTP::Status)) {
        eval "require $mod";
        plan skip_all => "$mod missing for httpd-unix.t" if $@;
 }
 
 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';
-my $psgi = getcwd() . '/t/httpd-corner.psgi';
+my $psgi = './t/httpd-corner.psgi';
 my $out = "$tmpdir/out.log";
 my $err = "$tmpdir/err.log";
 
@@ -35,10 +32,19 @@ my $spawn_httpd = sub {
        ok(defined $pid, 'forked httpd process successfully');
 };
 
+{
+       require PublicInbox::Daemon;
+       my $l = "$tmpdir/named.sock";
+       my $s = IO::Socket::UNIX->new(Listen => 5, Local => $l,
+                                       Type => SOCK_STREAM);
+       is(PublicInbox::Daemon::sockname($s), $l, 'sockname works for UNIX');
+}
+
 ok(!-S $unix, 'UNIX socket does not exist, yet');
 $spawn_httpd->("-l$unix");
+my %o = (Peer => $unix, Type => SOCK_STREAM);
 for (1..1000) {
-       last if -S $unix;
+       last if -S $unix && IO::Socket::UNIX->new(%o);
        select undef, undef, undef, 0.02
 }
 
@@ -46,6 +52,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');
@@ -95,6 +102,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');