X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fnntpd.t;h=153204dfdc14d39e3393e451b43dbfc15661b7bb;hb=dde1b083571ed893cbb1990f01f9e11ed804cba5;hp=b47cf7db33a512bcd204a05b6b0fd0ad7ea2e3b4;hpb=8c4505904f84411442b8b855a111da1461b57c45;p=public-inbox.git

diff --git a/t/nntpd.t b/t/nntpd.t
index b47cf7db..153204df 100644
--- a/t/nntpd.t
+++ b/t/nntpd.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
@@ -119,12 +119,6 @@ EOF
 		is($n->code, 580, 'got 580 code on server w/o TLS');
 	};
 
-	%opts = (
-		PeerAddr => $host_port,
-		Proto => 'tcp',
-		Type => SOCK_STREAM,
-		Timeout => 1,
-	);
 	my $mid = '<nntp@example.com>';
 	my %xhdr = (
 		'message-id' => $mid,
@@ -137,22 +131,20 @@ EOF
 		'references' => '<reftabsqueezed>',
 	);
 
-	my $s = IO::Socket::INET->new(%opts);
+	my $s = tcp_connect($sock);
 	sysread($s, my $buf, 4096);
 	is($buf, "201 " . hostname . " ready - post via email\r\n",
 		'got greeting');
-	$s->autoflush(1);
 
 	ok(syswrite($s, "   \r\n"), 'wrote spaces');
 	ok(syswrite($s, "\r\n"), 'wrote nothing');
 	syswrite($s, "NEWGROUPS\t19990424 000000 \033GMT\007\r\n");
 	is(0, sysread($s, $buf, 4096), 'GOT EOF on cntrl');
 
-	$s = IO::Socket::INET->new(%opts);
+	$s = tcp_connect($sock);
 	sysread($s, $buf, 4096);
 	is($buf, "201 " . hostname . " ready - post via email\r\n",
 		'got greeting');
-	$s->autoflush(1);
 
 	syswrite($s, "CAPABILITIES\r\n");
 	$buf = read_til_dot($s);