init: drop -N alias for --skip-artnum

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

diff --git a/t/init.t b/t/init.t
index 16581955435888ae3e5f7f80e7b1bf6e62a1568d..4d2c50496fc92b15bdf7b95521c77d0c58d10905 100644 (file)
--- a/t/init.t
+++ b/t/init.t
@@ -66,6 +66,7 @@ SKIP: {
        require_git(2.6, 1) or skip "git 2.6+ required", 2;
        use_ok 'PublicInbox::Msgmap';
        local $ENV{PI_DIR} = "$tmpdir/.public-inbox/";
+       local $ENV{PI_EMERGENCY} = "$tmpdir/.public-inbox/emergency";
        my $cfgfile = "$ENV{PI_DIR}/config";
        my $cmd = [ '-init', '-V2', 'v2list', "$tmpdir/v2list",
                   qw(http://example.com/v2list v2list@example.com) ];
@@ -115,7 +116,7 @@ SKIP: {
                        'publicinboxmda.spamcheck', 'none') == 0 or
                        BAIL_OUT "git config $?";
        my $addr = 'skip3@example.com';
-       $cmd = [ qw(-init -V2 -Lbasic -N12 skip3), "$tmpdir/skip3",
+       $cmd = [ qw(-init -V2 -Lbasic --skip-artnum=12 skip3), "$tmpdir/skip3",
                   qw(http://example.com/skip3), $addr ];
        ok(run_script($cmd), '--skip-artnum -V2');
        my $env = { ORIGINAL_RECIPIENT => $addr };
@@ -123,16 +124,19 @@ SKIP: {
        my $msg = "Message-ID: <$mid>\n\n";
        my $rdr = { 0 => \$msg, 2 => \(my $err = '')  };
        ok(run_script([qw(-mda --no-precheck)], $env, $rdr), 'deliver V1');
+       diag "err=$err" if $err;
        my $mm = PublicInbox::Msgmap->new_file("$tmpdir/skip3/msgmap.sqlite3");
        my $n = $mm->num_for($mid);
        is($n, 13, 'V2 NNTP article numbers skipped via --skip-artnum');
 
        $addr = 'skip4@example.com';
        $env = { ORIGINAL_RECIPIENT => $addr };
-       $cmd = [ qw(-init -V1 -N12 -Lmedium skip4), "$tmpdir/skip4",
+       $cmd = [ qw(-init -V1 --skip-artnum 12 -Lmedium skip4), "$tmpdir/skip4",
                   qw(http://example.com/skip4), $addr ];
        ok(run_script($cmd), '--skip-artnum -V1');
+       $err = '';
        ok(run_script([qw(-mda --no-precheck)], $env, $rdr), 'deliver V1');
+       diag "err=$err" if $err;
        $mm = PublicInbox::Msgmap->new("$tmpdir/skip4");
        $n = $mm->num_for($mid);
        is($n, 13, 'V1 NNTP article numbers skipped via --skip-artnum');