disambiguate OverIdx and Over by field name

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

diff --git a/t/nntpd.t b/t/nntpd.t
index 0b4a2636ac9d28ca925c00ab9b018f9f12eca687..d8a44334a55bf13e0b0037a3b3c8ba3e90085df9 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();
@@ -50,14 +46,11 @@ my $ibx = {
 $ibx = PublicInbox::Inbox->new($ibx);
 {
        local $ENV{HOME} = $home;
-       my @cmd = ('-init', $group, $inboxdir, 'http://example.com/', $addr);
-       push @cmd, "-V$version", '-Lbasic';
+       my @cmd = ('-init', $group, $inboxdir, 'http://example.com/', $addr,
+               "-V$version", '-Lbasic', '--newsgroup', $group);
        ok(run_script(\@cmd), 'init OK');
-       is(xsys(qw(git config), "--file=$home/.public-inbox/config",
-                       "publicinbox.$group.newsgroup", $group),
-               0, 'enabled newsgroup');
-       my $len;
 
+       my $len;
        $ibx = PublicInbox::InboxWritable->new($ibx);
        my $im = $ibx->importer(0);
 
@@ -350,7 +343,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'));
@@ -403,7 +396,7 @@ sub read_til_dot {
 
 sub test_watch {
        my ($tmpdir, $sock, $group) = @_;
-       use_ok 'PublicInbox::WatchMaildir';
+       use_ok 'PublicInbox::Watch';
        use_ok 'PublicInbox::InboxIdle';
        use_ok 'PublicInbox::Config';
        require_git('1.8.5', 1) or skip('git 1.8.5+ needed for --urlmatch', 4);