about summary refs log tree commit homepage
path: root/t/nntpd.t
diff options
context:
space:
mode:
authorEric Wong <e@yhbt.net>2020-08-02 03:09:37 +0000
committerEric Wong <e@yhbt.net>2020-08-03 04:29:02 +0000
commit5ac7008232e6adb6a8f0d1305f33a5124641a5b1 (patch)
treec2e710648265dbefef239d24be2cbbdc647e2dc9 /t/nntpd.t
parent77eafbd653d2efac546f2c330d8cf5e84bef2712 (diff)
downloadpublic-inbox-5ac7008232e6adb6a8f0d1305f33a5124641a5b1.tar.gz
No need to waste resources when doing minimal work.  With
PI_TEST_VERSION=2, this fixes a test failure where
Net::NNTP::DESTROY was getting called in the shard process.

We'll also get rid of an unnecessary use_ok under v2, too.
Diffstat (limited to 't/nntpd.t')
-rw-r--r--t/nntpd.t8
1 files changed, 2 insertions, 6 deletions
diff --git a/t/nntpd.t b/t/nntpd.t
index 0b4a2636..b9b9a63d 100644
--- a/t/nntpd.t
+++ b/t/nntpd.t
@@ -16,7 +16,7 @@ use POSIX qw(_exit);
 use Digest::SHA;
 use_ok 'PublicInbox::Msgmap';
 
-# FIXME: make easier to test both versions
+# t/nntpd-v2.t wraps this for v2
 my $version = $ENV{PI_TEST_VERSION} || 1;
 require_git('2.6') if $version == 2;
 my $lsof = which('lsof');
@@ -30,10 +30,6 @@ my $out = "$tmpdir/stdout.log";
 my $inboxdir = "$tmpdir/main.git";
 my $group = 'test-nntpd';
 my $addr = $group . '@example.com';
-SKIP: {
-        skip "git 2.6+ required for V2Writable", 1 if $version == 1;
-        use_ok 'PublicInbox::V2Writable';
-}
 
 my %opts;
 my $sock = tcp_server();
@@ -350,7 +346,7 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000
                         delete $ibx->{mm};
                         rename($tmp, $f) or BAIL_OUT "rename($tmp, $f): $!";
                 }
-                ok(run_script([qw(-index --reindex -c), $ibx->{inboxdir}],
+                ok(run_script([qw(-index -c -j0 --reindex), $ibx->{inboxdir}],
                                 undef, $noerr), '-compacted');
                 select(undef, undef, undef, $fast_idle ? 0.1 : 2.1);
                 $art = $n->article($ex->header('Message-ID'));