X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fhttpd.t;h=af9fbfeb2bd317596c08314083e34a0f79ae4444;hb=860169adcd29341142b7c4a369c09b4ac492bd1e;hp=2fc28355e97851f66b8f3adf3f39bb88c9db190e;hpb=fb6aa4da304125a3fb7932e1335be85ff260e031;p=public-inbox.git

diff --git a/t/httpd.t b/t/httpd.t
index 2fc28355..af9fbfeb 100644
--- a/t/httpd.t
+++ b/t/httpd.t
@@ -44,11 +44,9 @@ EOF
 		$im->add($mime);
 		$im->done($mime);
 	}
-	ok($sock, 'sock created');
 	$cmd = [ '-httpd', '-W0', "--stdout=$out", "--stderr=$err" ];
 	$td = start_script($cmd, undef, { 3 => $sock });
-	my $host = $sock->sockhost;
-	my $port = $sock->sockport;
+	my $http_pfx = 'http://'.tcp_host_port($sock);
 	{
 		my $bad = tcp_connect($sock);
 		print $bad "GETT / HTTP/1.0\r\n\r\n" or die;
@@ -65,7 +63,7 @@ EOF
 	}
 
 	is(xsys(qw(git clone -q --mirror),
-			"http://$host:$port/$group", "$tmpdir/clone.git"),
+			"$http_pfx/$group", "$tmpdir/clone.git"),
 		0, 'smart clone successful');
 
 	# ensure dumb cloning works, too:
@@ -73,7 +71,7 @@ EOF
 		qw(config http.uploadpack false)),
 		0, 'disable http.uploadpack');
 	is(xsys(qw(git clone -q --mirror),
-			"http://$host:$port/$group", "$tmpdir/dumb.git"),
+			"$http_pfx/$group", "$tmpdir/dumb.git"),
 		0, 'clone successful');
 
 	ok($td->kill, 'killed httpd');