X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fnntpd.t;h=56b1d604518558e67284580f08076eef6820c4d9;hb=3d41aa23f35501ca92aab8aa42980fa73f7fa74f;hp=60cf8938ff6adcf0336fd543447bc78f0abef919;hpb=fc0527961bd1ff338b21c1d326c73150ab92c56e;p=public-inbox.git

diff --git a/t/nntpd.t b/t/nntpd.t
index 60cf8938..56b1d604 100644
--- a/t/nntpd.t
+++ b/t/nntpd.t
@@ -1,5 +1,5 @@
-# Copyright (C) 2015 all contributors <meta@public-inbox.org>
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2015-2018 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
 use Test::More;
@@ -24,7 +24,6 @@ my $out = "$tmpdir/stdout.log";
 my $maindir = "$tmpdir/main.git";
 my $group = 'test-nntpd';
 my $addr = $group . '@example.com';
-my $cfgpfx = "publicinbox.$group";
 my $nntpd = 'blib/script/public-inbox-nntpd';
 my $init = 'blib/script/public-inbox-init';
 use_ok 'PublicInbox::Import';
@@ -44,6 +43,9 @@ END { kill 'TERM', $pid if defined $pid };
 {
 	local $ENV{HOME} = $home;
 	system($init, $group, $maindir, 'http://example.com/', $addr);
+	is(system(qw(git config), "--file=$home/.public-inbox/config",
+			"publicinbox.$group.newsgroup", $group),
+		0, 'enabled newsgroup');
 	my $len;
 
 	# ensure successful message delivery
@@ -60,7 +62,9 @@ Content-Transfer-Encoding: 8bit
 
 This is a test message for El\xc3\xa9anor
 EOF
-		$mime->header_set('List-Id', "<$addr>");
+		my $list_id = $addr;
+		$list_id =~ s/@/./;
+		$mime->header_set('List-Id', "<$list_id>");
 		$len = length($mime->as_string);
 		my $git = PublicInbox::Git->new($maindir);
 		my $im = PublicInbox::Import->new($git, 'test', $addr);
@@ -118,6 +122,18 @@ EOF
 	is($buf, "201 server ready - post via email\r\n", 'got greeting');
 	$s->autoflush(1);
 
+	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);
+	sysread($s, $buf, 4096);
+	is($buf, "201 server ready - post via email\r\n", 'got greeting');
+	$s->autoflush(1);
+
+	syswrite($s, "NEWGROUPS 19990424 000000 GMT\r\n");
+	$buf = read_til_dot($s);
+	like($buf, qr/\A231 list of /, 'newgroups OK');
+
 	while (my ($k, $v) = each %xhdr) {
 		is_deeply($n->xhdr("$k $mid"), { $mid => $v },
 			  "XHDR $k by message-id works");
@@ -127,9 +143,7 @@ EOF
 			  "$k by article range works");
 		$buf = '';
 		syswrite($s, "HDR $k $mid\r\n");
-		do {
-			sysread($s, $buf, 4096, length($buf));
-		} until ($buf =~ /\r\n\.\r\n\z/);
+		$buf = read_til_dot($s);
 		my @r = split("\r\n", $buf);
 		like($r[0], qr/\A225 /, '225 response for HDR');
 		is($r[1], "0 $v", 'got expected response for HDR');
@@ -161,12 +175,19 @@ EOF
 			$len,
 			'1' ] }, "XOVER by article works");
 
+	is_deeply($n->head(1), $n->head('<nntp@example.com>'), 'HEAD OK');
+	is_deeply($n->body(1), $n->body('<nntp@example.com>'), 'BODY OK');
+	is($n->body(1)->[0], "This is a test message for El\xc3\xa9anor\n",
+		'body really matches');
+	my $art = $n->article(1);
+	is(ref($art), 'ARRAY', 'got array for ARTICLE');
+	is_deeply($art, $n->article('<nntp@example.com>'), 'ARTICLE OK');
+	is($n->article(999), undef, 'non-existent num');
+	is($n->article('<non-existent@example>'), undef, 'non-existent mid');
+
 	{
 		syswrite($s, "OVER $mid\r\n");
-		$buf = '';
-		do {
-			sysread($s, $buf, 4096, length($buf));
-		} until ($buf =~ /\r\n\.\r\n\z/);
+		$buf = read_til_dot($s);
 		my @r = split("\r\n", $buf);
 		like($r[0], qr/^224 /, 'got 224 response for OVER');
 		is($r[1], "0\tTesting for El\xc3\xa9anor\t" .
@@ -183,6 +204,14 @@ EOF
 	is_deeply($n->xhdr(qw(list-id 1-)), {},
 		 'XHDR on invalid header returns empty');
 
+	{
+		my $t0 = time;
+		my $date = $n->date;
+		my $t1 = time;
+		ok($date >= $t0, 'valid date after start');
+		ok($date <= $t1, 'valid date before stop');
+	}
+
 	{
 		setsockopt($s, IPPROTO_TCP, TCP_NODELAY, 1);
 		syswrite($s, 'HDR List-id 1-');
@@ -200,6 +229,7 @@ EOF
 		is(scalar @r, 1, 'only one response line');
 	}
 
+	$n = $s = undef;
 	is($pid, waitpid($pid, 0), 'nntpd exited successfully');
 	my $eout = eval {
 		local $/;
@@ -212,4 +242,13 @@ EOF
 
 done_testing();
 
+sub read_til_dot {
+	my ($s) = @_;
+	my $buf = '';
+	do {
+		sysread($s, $buf, 4096, length($buf));
+	} until ($buf =~ /\r\n\.\r\n\z/);
+	$buf;
+}
+
 1;