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.
t/multi-mid.t
t/nntp.t
t/nntpd-tls.t
t/multi-mid.t
t/nntp.t
t/nntpd-tls.t
t/nntpd.t
t/nodatacow.t
t/nulsubject.t
t/nntpd.t
t/nodatacow.t
t/nulsubject.t
--- /dev/null
+# Copyright (C) 2019-2020 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+local $ENV{PI_TEST_VERSION} = 1;
+require './t/nntpd.t';
use Digest::SHA;
use_ok 'PublicInbox::Msgmap';
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');
my $version = $ENV{PI_TEST_VERSION} || 1;
require_git('2.6') if $version == 2;
my $lsof = which('lsof');
my $inboxdir = "$tmpdir/main.git";
my $group = 'test-nntpd';
my $addr = $group . '@example.com';
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();
my %opts;
my $sock = tcp_server();
delete $ibx->{mm};
rename($tmp, $f) or BAIL_OUT "rename($tmp, $f): $!";
}
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'));
undef, $noerr), '-compacted');
select(undef, undef, undef, $fast_idle ? 0.1 : 2.1);
$art = $n->article($ex->header('Message-ID'));