X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fhttpd-unix.t;h=b3cf8693118b66cf67f350d7366fd4c3566333de;hb=69329215485cf2ab9d8cd1fa7faf65d8ec42dc0b;hp=580d14d2abbf4cbd9d72aa69bdd2799e890a3355;hpb=8557833d769280495ababfa71f202bf131ea5512;p=public-inbox.git

diff --git a/t/httpd-unix.t b/t/httpd-unix.t
index 580d14d2..b3cf8693 100644
--- 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 Danga::Socket
+			HTTP::Date HTTP::Status)) {
 	eval "require $mod";
 	plan skip_all => "$mod missing for httpd-unix.t" if $@;
 }
@@ -35,6 +35,14 @@ 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");
 for (1..1000) {
@@ -46,6 +54,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');
@@ -81,7 +90,11 @@ check_sock($unix);
 	is($?, 0, 'existing httpd exited successfully');
 	ok(-S $unix, 'unix socket still exists');
 }
-{
+
+SKIP: {
+	eval 'require Net::Server::Daemonize';
+	skip('Net::Server missing for pid-file/daemonization test', 10) if $@;
+
 	# wait for daemonization
 	$spawn_httpd->("-l$unix", '-D', '-P', "$tmpdir/pid");
 	my $kpid = $pid;
@@ -91,6 +104,7 @@ check_sock($unix);
 
 	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');