convert: support new -index options

[public-inbox.git] / t / nntpd.t

diff --git a/t/nntpd.t b/t/nntpd.t
index aaf6661deaab8cbd88af8fe454adf4abc690bfa0..b9b9a63d34ad38f5f2ce0aeb4efafa9043ec5b81 100644 (file)
--- 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();
@@ -206,6 +202,7 @@ EOF
 
        is_deeply($n->head(1), $n->head('<nntp@example.com>'), 'HEAD OK');
        is_deeply($n->body(1), $n->body('<nntp@example.com>'), 'BODY OK');
+       is_deeply($n->nntpstat(1), '<nntp@example.com>', 'STAT');
        is($n->body(1)->[0], "This is a test message for El\xc3\xa9anor\n",
                'body really matches');
        my $art = $n->article(1);
@@ -349,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'));