X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fwatch_maildir_v2.t;h=b2514c16ad4827bba720532070e9ee8fdc721b1e;hb=78792fee4031aee0a8bd532bff98efc2b9409d68;hp=fc002dc1f73dd34dd41ae219f3c462d183f2a895;hpb=9015a8af2909b0071e54b332bfafc4e5b8d0f6c2;p=public-inbox.git diff --git a/t/watch_maildir_v2.t b/t/watch_maildir_v2.t index fc002dc1..b2514c16 100644 --- a/t/watch_maildir_v2.t +++ b/t/watch_maildir_v2.t @@ -1,28 +1,26 @@ -# Copyright (C) 2018 all contributors +# Copyright (C) 2018-2020 all contributors # License: AGPL-3.0+ +use strict; use Test::More; -use File::Temp qw/tempdir/; use PublicInbox::MIME; use Cwd; use PublicInbox::Config; -my @mods = qw(Filesys::Notify::Simple PublicInbox::V2Writable); -foreach my $mod (@mods) { - eval "require $mod"; - plan skip_all => "$mod missing for watch_maildir_v2.t" if $@; -} - -my $tmpdir = tempdir('watch_maildir-v2-XXXXXX', TMPDIR => 1, CLEANUP => 1); -my $mainrepo = "$tmpdir/v2"; +use PublicInbox::TestCommon; +require_git(2.6); +require_mods(qw(Search::Xapian DBD::SQLite Filesys::Notify::Simple)); +require PublicInbox::V2Writable; +my ($tmpdir, $for_destroy) = tmpdir(); +my $inboxdir = "$tmpdir/v2"; my $maildir = "$tmpdir/md"; my $spamdir = "$tmpdir/spam"; use_ok 'PublicInbox::WatchMaildir'; use_ok 'PublicInbox::Emergency'; my $cfgpfx = "publicinbox.test"; my $addr = 'test-public@example.com'; -my @cmd = ('blib/script/public-inbox-init', '-V2', 'test', $mainrepo, +my @cmd = ('-init', '-V2', 'test', $inboxdir, 'http://example.com/v2list', $addr); local $ENV{PI_CONFIG} = "$tmpdir/pi_config"; -is(system(@cmd), 0, 'public-inbox init OK'); +ok(run_script(\@cmd), 'public-inbox init OK'); my $msg = <new($spamdir); # create dirs -my $config = PublicInbox::Config->new({ - "$cfgpfx.address" => $addr, - "$cfgpfx.mainrepo" => $mainrepo, - "$cfgpfx.watch" => "maildir:$maildir", - "$cfgpfx.filter" => 'PublicInbox::Filter::Vger', - "publicinboxlearn.watchspam" => "maildir:$spamdir", -}); +my $orig = <new(\$orig); my $ibx = $config->lookup_name('test'); ok($ibx, 'found inbox by name'); my $srch = $ibx->search; @@ -53,7 +52,7 @@ PublicInbox::WatchMaildir->new($config)->scan('full'); my ($total, undef) = $srch->reopen->query(''); is($total, 1, 'got one revision'); -# my $git = PublicInbox::Git->new("$mainrepo/git/0.git"); +# my $git = PublicInbox::Git->new("$inboxdir/git/0.git"); # my @list = $git->qx(qw(rev-list refs/heads/master)); # is(scalar @list, 1, 'one revision in rev-list'); @@ -103,7 +102,7 @@ More majordomo info at http://vger.kernel.org/majordomo-info.html\n); local $SIG{__WARN__} = sub {}; # quiet spam check warning PublicInbox::WatchMaildir->new($config)->scan('full'); } - ($nr, $msgs) = $srch->reopen->query(''); + my ($nr, $msgs) = $srch->reopen->query(''); is($nr, 0, 'inbox is still empty'); is(unlink(glob("$maildir/new/*")), 1); } @@ -116,7 +115,7 @@ More majordomo info at http://vger.kernel.org/majordomo-info.html\n); PublicInbox::Emergency->new($maildir)->prepare(\$msg); $config->{'publicinboxwatch.spamcheck'} = 'spamc'; PublicInbox::WatchMaildir->new($config)->scan('full'); - ($nr, $msgs) = $srch->reopen->query(''); + my ($nr, $msgs) = $srch->reopen->query(''); is($nr, 1, 'inbox has one mail after spamc OK-ed a message'); my $mref = $ibx->msg_by_smsg($msgs->[0]); like($$mref, qr/something\n\z/s, 'message scrubbed on import'); @@ -129,7 +128,7 @@ More majordomo info at http://vger.kernel.org/majordomo-info.html\n); $msg = eval { local $/; <$fh> }; PublicInbox::Emergency->new($maildir)->prepare(\$msg); PublicInbox::WatchMaildir->new($config)->scan('full'); - ($nr, $msgs) = $srch->reopen->query('dfpost:6e006fd7'); + my ($nr, $msgs) = $srch->reopen->query('dfpost:6e006fd7'); is($nr, 1, 'diff postimage found'); my $post = $msgs->[0]; ($nr, $msgs) = $srch->query('dfpre:090d998b6c2c'); @@ -137,4 +136,66 @@ More majordomo info at http://vger.kernel.org/majordomo-info.html\n); is($post->{blob}, $msgs->[0]->{blob}, 'same message'); } +# multiple inboxes in the same maildir +{ + my $v1repo = "$tmpdir/v1"; + my $v1pfx = "publicinbox.v1"; + my $v1addr = 'v1-public@example.com'; + is(system(qw(git init -q --bare), $v1repo), 0, 'v1 init OK'); + my $cfg2 = <new(\$cfg2); + my $both = < +Date: Sat, 18 Jun 2016 00:00:00 +0000 + +both +EOF + PublicInbox::Emergency->new($maildir)->prepare(\$both); + PublicInbox::WatchMaildir->new($config)->scan('full'); + my ($total, $msgs) = $srch->reopen->query('m:both@b.com'); + my $v1 = $config->lookup_name('v1'); + my $msg = $v1->git->cat_file($msgs->[0]->{blob}); + is($both, $$msg, 'got original message back from v1'); + $msg = $ibx->git->cat_file($msgs->[0]->{blob}); + is($both, $$msg, 'got original message back from v2'); +} + +{ + my $want = <<'EOF'; +From: +List-Id: +Message-ID: +EOF + my $do_not_want = <<'EOF'; +From: +List-Id: +X-Mailing-List: no@example.com +Message-ID: +EOF + my $cfg = $orig."$cfgpfx.listid=i.want.you.to.want.me\n"; + PublicInbox::Emergency->new($maildir)->prepare(\$want); + PublicInbox::Emergency->new($maildir)->prepare(\$do_not_want); + my $config = PublicInbox::Config->new(\$cfg); + PublicInbox::WatchMaildir->new($config)->scan('full'); + $ibx = $config->lookup_name('test'); + my $num = $ibx->mm->num_for('do.want@example.com'); + ok(defined $num, 'List-ID matched for watch'); + $num = $ibx->mm->num_for('do.not.want@example.com'); + is($num, undef, 'unaccepted List-ID matched for watch'); + + $cfg = $orig."$cfgpfx.watchheader=X-Mailing-List:no\@example.com\n"; + $config = PublicInbox::Config->new(\$cfg); + PublicInbox::WatchMaildir->new($config)->scan('full'); + $ibx = $config->lookup_name('test'); + $num = $ibx->mm->num_for('do.not.want@example.com'); + ok(defined $num, 'X-Mailing-List matched'); +} + done_testing;