X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fnntpd.t;h=66aa48f1e67946def9ef5005222f191f00f6b91e;hb=6e07def560b211d9a1a3221862e72b7aeb4a31b3;hp=243b8e5637ce80ba7659a6df3b2468f288ffcd6c;hpb=a09f678d8254064af7ca6dcfb3c3f84b5ae37b51;p=public-inbox.git
diff --git a/t/nntpd.t b/t/nntpd.t
index 243b8e56..66aa48f1 100644
--- a/t/nntpd.t
+++ b/t/nntpd.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2019 all contributors
+# Copyright (C) 2015-2020 all contributors
# License: AGPL-3.0+
use strict;
use warnings;
@@ -48,7 +48,7 @@ $ibx = PublicInbox::Inbox->new($ibx);
my @cmd = ('-init', $group, $inboxdir, 'http://example.com/', $addr);
push @cmd, "-V$version", '-Lbasic';
ok(run_script(\@cmd), 'init OK');
- is(system(qw(git config), "--file=$home/.public-inbox/config",
+ is(xsys(qw(git config), "--file=$home/.public-inbox/config",
"publicinbox.$group.newsgroup", $group),
0, 'enabled newsgroup');
my $len;
@@ -268,7 +268,7 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000
$for_leafnode->header_set('Message-ID', @mids);
$for_leafnode->body_set('not-a-dupe');
my $warn = '';
- $SIG{__WARN__} = sub { $warn .= join('', @_) };
+ local $SIG{__WARN__} = sub { $warn .= join('', @_) };
$im->add($for_leafnode);
$im->done;
like($warn, qr/reused/, 'warned for reused MID');
@@ -301,10 +301,11 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000
is($? >> 8, 0, 'no errors');
}
SKIP: {
- if ($INC{'Search/Xapian.pm'} && ($ENV{TEST_RUN_MODE}//1)) {
+ if ($INC{'Search/Xapian.pm'} && ($ENV{TEST_RUN_MODE}//2)) {
skip 'Search/Xapian.pm pre-loaded (by t/run.perl?)', 1;
}
- my @of = `lsof -p $td->{pid} 2>/dev/null`;
+ my $rdr = { 2 => \(my $null) };
+ my @of = xqx(['lsof', '-p', $td->{pid}], undef, $rdr);
skip('lsof broken', 1) if (!scalar(@of) || $?);
my @xap = grep m!Search/Xapian!, @of;
is_deeply(\@xap, [], 'Xapian not loaded in nntpd');