X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fv2writable.t;h=66d5663e2a5895b8872351d36f87efe7baa10b06;hb=04e4a5573de1b9ed2f6528a0de568a1693882eea;hp=2b82576878e13b9def584dfe5578352f4c28a4a2;hpb=e67dc3e9fc73029332a632d022002d3ce80c1306;p=public-inbox.git

diff --git a/t/v2writable.t b/t/v2writable.t
index 2b825768..66d5663e 100644
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -1,20 +1,18 @@
-# Copyright (C) 2018-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2018-2020 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;
 use PublicInbox::MIME;
-use PublicInbox::ContentId qw(content_digest);
-use File::Temp qw/tempdir/;
-require './t/common.perl';
+use PublicInbox::ContentId qw(content_digest content_id);
+use PublicInbox::TestCommon;
+use Cwd qw(abs_path);
 require_git(2.6);
-foreach my $mod (qw(DBD::SQLite Search::Xapian)) {
-	eval "require $mod";
-	plan skip_all => "$mod missing for nntpd.t" if $@;
-}
+require_mods(qw(DBD::SQLite Search::Xapian));
+local $ENV{HOME} = abs_path('t');
 use_ok 'PublicInbox::V2Writable';
 umask 007;
-my $inboxdir = tempdir('pi-v2writable-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($inboxdir, $for_destroy) = tmpdir();
 my $ibx = {
 	inboxdir => $inboxdir,
 	name => 'test-v2writable',
@@ -111,6 +109,11 @@ if ('ensure git configs are correct') {
 	@mids = $mime->header_obj->header_raw('Message-Id');
 	like($mids[0], $sane_mid, 'mid was generated');
 	is(scalar(@mids), 1, 'new generated');
+
+	@warn = ();
+	$mime->header_set('Message-Id', '<space@ (NXDOMAIN) >');
+	ok($im->add($mime), 'message added with space in Message-Id');
+	is_deeply([], \@warn);
 }
 
 {
@@ -163,12 +166,10 @@ EOF
 	close $fh or die "close: $!\n";
 	my $sock = tcp_server();
 	ok($sock, 'sock created');
-	my $pid;
 	my $len;
-	END { kill 'TERM', $pid if defined $pid };
-	my $nntpd = 'blib/script/public-inbox-nntpd';
-	my $cmd = [ $nntpd, "--stdout=$out", "--stderr=$err" ];
-	$pid = spawn_listener({ PI_CONFIG => $pi_config }, $cmd, [ $sock ]);
+	my $cmd = [ '-nntpd', '-W0', "--stdout=$out", "--stderr=$err" ];
+	my $env = { PI_CONFIG => $pi_config };
+	my $td = start_script($cmd, $env, { 3 => $sock });
 	my $host_port = $sock->sockhost . ':' . $sock->sockport;
 	my $n = Net::NNTP->new($host_port);
 	$n->group($group);
@@ -179,8 +180,13 @@ EOF
 		is($uniq{$mid}++, 0, "MID for $num is unique in XOVER");
 		is_deeply($n->xhdr('Message-ID', $num),
 			 { $num => $mid }, "XHDR lookup OK on num $num");
+
+		# FIXME PublicInbox::NNTP (server) doesn't handle spaces in
+		# Message-ID, but neither does Net::NNTP (client)
+		next if $mid =~ / /;
+
 		is_deeply($n->xhdr('Message-ID', $mid),
-			 { $mid => $mid }, "XHDR lookup OK on MID $num");
+			 { $mid => $mid }, "XHDR lookup OK on MID $mid ($num)");
 	}
 	my %nn;
 	foreach my $mid (@{$n->newnews(0, $group)}) {
@@ -210,7 +216,10 @@ EOF
 	my $before = $git0->qx(@log, qw(--pretty=raw --raw -r));
 	$im = PublicInbox::V2Writable->new($ibx, {nproc => 2});
 	is($im->{shards}, 1, 'detected single shard from previous');
-	my $smsg = $im->remove($mime, 'test removal');
+	my ($mark, $rm_mime, $smsg) = $im->remove($mime, 'test removal');
+	is(content_id($rm_mime), content_id($mime),
+			'removed object returned matches');
+	ok(defined($mark), 'mark set');
 	$im->done;
 	my @after = $git0->qx(@log, qw(--pretty=oneline));
 	my $tip = shift @after;
@@ -276,4 +285,40 @@ EOF
 	$im->done;
 }
 
+my $tmp = {
+	inboxdir => "$inboxdir/non-existent/subdir",
+	name => 'nope',
+	version => 2,
+	-primary_address => 'test@example.com',
+};
+eval {
+	my $nope = PublicInbox::V2Writable->new($tmp);
+	$nope->add($mime);
+};
+ok($@, 'V2Writable fails on non-existent dir');
+
+{
+	my $v2w = PublicInbox::V2Writable->new($tmp, 1);
+	ok($v2w, 'creat flag works');
+	$v2w->{parallel} = 0;
+	$v2w->init_inbox(0);
+	my $alt = "$tmp->{inboxdir}/all.git/objects/info/alternates";
+	open my $fh, '>>', $alt or die $!;
+	print $fh "$inboxdir/all.git/objects\n" or die $!;
+	chmod(0664, $fh) or die "fchmod: $!";
+	close $fh or die $!;
+	open $fh, '<', $alt or die $!;
+	my $before = do { local $/; <$fh> };
+
+	ok($v2w->git_init(3), 'init a new epoch');
+	open $fh, '<', $alt or die $!;
+	my $after = do { local $/; <$fh> };
+	ok(index($after, $before) > 0,
+		'old contents preserved after adding epoch');
+	like($after, qr!\A[^\n]+?/3\.git/objects\n!s,
+		'first line is newest epoch');
+	my $mode = (stat($alt))[2] & 07777;
+	is($mode, 0664, sprintf('0%03o', $mode).' is 0664');
+}
+
 done_testing();