X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fv2writable.t;h=f8ef415acc51061b30fbd006ee491edb74c7c536;hb=fe86054ee1e2d93b19762a34ed1aaebe43635ff0;hp=b3cdbd3e6c0ff2d336852108ed7aef874e2b0d2b;hpb=29072fb327da93cff00ce4970e9c8de23ef0a618;p=public-inbox.git

diff --git a/t/v2writable.t b/t/v2writable.t
index b3cdbd3e..f8ef415a 100644
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -6,6 +6,8 @@ use Test::More;
 use PublicInbox::MIME;
 use PublicInbox::ContentId qw(content_digest);
 use File::Temp qw/tempdir/;
+require './t/common.perl';
+require_git(2.6);
 foreach my $mod (qw(DBD::SQLite Search::Xapian)) {
 	eval "require $mod";
 	plan skip_all => "$mod missing for nntpd.t" if $@;
@@ -129,12 +131,11 @@ if ('ensure git configs are correct') {
 }
 
 SKIP: {
-	use Fcntl qw(FD_CLOEXEC F_SETFD F_GETFD);
 	use Net::NNTP;
 	use IO::Socket;
 	use Socket qw(SO_KEEPALIVE IPPROTO_TCP TCP_NODELAY);
-	eval { require Danga::Socket };
-	skip "Danga::Socket missing $@", 2 if $@;
+	eval { require PublicInbox::DS };
+	skip "PublicInbox::DS missing $@", 2 if $@;
 	my $err = "$mainrepo/stderr.log";
 	my $out = "$mainrepo/stdout.log";
 	my %opts = (
@@ -161,27 +162,9 @@ EOF
 	my $pid;
 	my $len;
 	END { kill 'TERM', $pid if defined $pid };
-	$! = 0;
-	my $fl = fcntl($sock, F_GETFD, 0);
-	ok(! $!, 'no error from fcntl(F_GETFD)');
-	is($fl, FD_CLOEXEC, 'cloexec set by default (Perl behavior)');
-	$pid = fork;
-	if ($pid == 0) {
-		use POSIX qw(dup2);
-		$ENV{PI_CONFIG} = $pi_config;
-		# pretend to be systemd
-		fcntl($sock, F_SETFD, $fl &= ~FD_CLOEXEC);
-		dup2(fileno($sock), 3) or die "dup2 failed: $!\n";
-		$ENV{LISTEN_PID} = $$;
-		$ENV{LISTEN_FDS} = 1;
-		my $nntpd = 'blib/script/public-inbox-nntpd';
-		exec $nntpd, "--stdout=$out", "--stderr=$err";
-		die "FAIL: $!\n";
-	}
-	ok(defined $pid, 'forked nntpd process successfully');
-	$! = 0;
-	fcntl($sock, F_SETFD, $fl |= FD_CLOEXEC);
-	ok(! $!, 'no error from fcntl(F_SETFD)');
+	my $nntpd = 'blib/script/public-inbox-nntpd';
+	my $cmd = [ $nntpd, "--stdout=$out", "--stderr=$err" ];
+	$pid = spawn_listener({ PI_CONFIG => $pi_config }, $cmd, [ $sock ]);
 	my $host_port = $sock->sockhost . ':' . $sock->sockport;
 	my $n = Net::NNTP->new($host_port);
 	$n->group($group);
@@ -219,13 +202,14 @@ EOF
 };
 {
 	local $ENV{NPROC} = 2;
-	my @before = $git0->qx(qw(log --pretty=oneline));
-	my $before = $git0->qx(qw(log --pretty=raw --raw -r --no-abbrev));
+	my @log = qw(log --no-decorate --no-abbrev --no-notes --no-color);
+	my @before = $git0->qx(@log, qw(--pretty=oneline));
+	my $before = $git0->qx(@log, qw(--pretty=raw --raw -r));
 	$im = PublicInbox::V2Writable->new($ibx, 1);
 	is($im->{partitions}, 1, 'detected single partition from previous');
 	my $smsg = $im->remove($mime, 'test removal');
 	$im->done;
-	my @after = $git0->qx(qw(log --pretty=oneline));
+	my @after = $git0->qx(@log, qw(--pretty=oneline));
 	my $tip = shift @after;
 	like($tip, qr/\A[a-f0-9]+ test removal\n\z/s,
 		'commit message propagated to git');
@@ -237,7 +221,7 @@ EOF
 	my $srch = $ibx->search->reopen;
 	my $mset = $srch->query('m:'.$smsg->mid, { mset => 1});
 	is($mset->size, 0, 'no longer found in Xapian');
-	my @log1 = qw(log -1 --pretty=raw --raw -r --no-abbrev --no-renames);
+	my @log1 = (@log, qw(-1 --pretty=raw --raw -r --no-renames));
 	is($srch->{over_ro}->get_art($num), undef,
 		'removal propagated to Over DB');
 
@@ -263,13 +247,15 @@ EOF
 	ok(my $cmts = $im->purge($mime), 'purged message');
 	like($cmts->[0], qr/\A[a-f0-9]{40}\z/, 'purge returned current commit');
 	$im->done;
+
+	# again
+	is($im->purge($mime), undef, 'no-op returns undef');
 }
 
 {
-	my @warn;
 	my $x = 'x'x250;
 	my $y = 'y'x250;
-	local $SIG{__WARN__} = sub { push @warn, @_ };
+	local $SIG{__WARN__} = sub {};
 	$mime->header_set('Subject', 'long mid');
 	$mime->header_set('Message-ID', "<$x>");
 	ok($im->add($mime), 'add excessively long Message-ID');