X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fwatch_maildir_v2.t;h=7b46232b36beab4473437f0505b3db5ab705396a;hb=refs%2Fheads%2Fmaster;hp=b2cff4bac5b91439d60f5847a83a77d9374264a5;hpb=0b1de991a099b5e8b9a9e3e85b5eaaacc9362dbb;p=public-inbox.git diff --git a/t/watch_maildir_v2.t b/t/watch_maildir_v2.t index b2cff4ba..7b46232b 100644 --- a/t/watch_maildir_v2.t +++ b/t/watch_maildir_v2.t @@ -1,30 +1,27 @@ -# Copyright (C) 2018 all contributors +# Copyright (C) 2018-2021 all contributors # License: AGPL-3.0+ +use strict; use Test::More; -use File::Temp qw/tempdir/; -use PublicInbox::MIME; +use PublicInbox::Eml; use Cwd; use PublicInbox::Config; -require './t/common.perl'; +use PublicInbox::TestCommon; +use PublicInbox::Import; require_git(2.6); -my @mods = qw(Search::Xapian DBD::SQLite Filesys::Notify::Simple); -foreach my $mod (@mods) { - eval "require $mod"; - plan skip_all => "$mod missing for watch_maildir_v2.t" if $@; -} +require_mods(qw(Search::Xapian DBD::SQLite)); require PublicInbox::V2Writable; -my $tmpdir = tempdir('watch_maildir-v2-XXXXXX', TMPDIR => 1, CLEANUP => 1); -my $mainrepo = "$tmpdir/v2"; +my ($tmpdir, $for_destroy) = tmpdir(); +my $inboxdir = "$tmpdir/v2"; my $maildir = "$tmpdir/md"; my $spamdir = "$tmpdir/spam"; -use_ok 'PublicInbox::WatchMaildir'; +use_ok 'PublicInbox::Watch'; 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 %orig = ( - "$cfgpfx.address" => $addr, - "$cfgpfx.mainrepo" => $mainrepo, - "$cfgpfx.watch" => "maildir:$maildir", - "$cfgpfx.filter" => 'PublicInbox::Filter::Vger', - "publicinboxlearn.watchspam" => "maildir:$spamdir" -); -my $config = PublicInbox::Config->new({%orig}); -my $ibx = $config->lookup_name('test'); +my $orig = <new(\$orig); +my $ibx = $cfg->lookup_name('test'); ok($ibx, 'found inbox by name'); -my $srch = $ibx->search; +$ibx->{-no_fsync} = 1; -PublicInbox::WatchMaildir->new($config)->scan('full'); -my ($total, undef) = $srch->reopen->query(''); +PublicInbox::Watch->new($cfg)->scan('full'); +my $total = scalar @{$ibx->over->recent}; 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'); @@ -72,8 +69,9 @@ my $write_spam = sub { }; $write_spam->(); is(unlink(glob("$maildir/new/*")), 1, 'unlinked old spam'); -PublicInbox::WatchMaildir->new($config)->scan('full'); -is(($srch->reopen->query(''))[0], 0, 'deleted file'); +PublicInbox::Watch->new($cfg)->scan('full'); +is_deeply($ibx->over->recent, [], 'deleted file'); +is(unlink(glob("$spamdir/cur/*")), 1, 'unlinked trained spam'); # check with scrubbing { @@ -82,17 +80,18 @@ To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo\@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html\n); PublicInbox::Emergency->new($maildir)->prepare(\$msg); - PublicInbox::WatchMaildir->new($config)->scan('full'); - my ($nr, $msgs) = $srch->reopen->query(''); - is($nr, 1, 'got one file back'); + PublicInbox::Watch->new($cfg)->scan('full'); + my $msgs = $ibx->over->recent; + is(scalar(@$msgs), 1, 'got one file back'); my $mref = $ibx->msg_by_smsg($msgs->[0]); like($$mref, qr/something\n\z/s, 'message scrubbed on import'); is(unlink(glob("$maildir/new/*")), 1, 'unlinked spam'); $write_spam->(); - PublicInbox::WatchMaildir->new($config)->scan('full'); - ($nr, $msgs) = $srch->reopen->query(''); - is($nr, 0, 'inbox is empty again'); + PublicInbox::Watch->new($cfg)->scan('full'); + $msgs = $ibx->over->recent; + is(scalar(@$msgs), 0, 'inbox is empty again'); + is(unlink(glob("$spamdir/cur/*")), 1, 'unlinked trained spam'); } { @@ -101,13 +100,13 @@ More majordomo info at http://vger.kernel.org/majordomo-info.html\n); my $fail_path = "$fail_bin:$ENV{PATH}"; # for spamc ham mock local $ENV{PATH} = $fail_path; PublicInbox::Emergency->new($maildir)->prepare(\$msg); - $config->{'publicinboxwatch.spamcheck'} = 'spamc'; + $cfg->{'publicinboxwatch.spamcheck'} = 'spamc'; { local $SIG{__WARN__} = sub {}; # quiet spam check warning - PublicInbox::WatchMaildir->new($config)->scan('full'); + PublicInbox::Watch->new($cfg)->scan('full'); } - ($nr, $msgs) = $srch->reopen->query(''); - is($nr, 0, 'inbox is still empty'); + my $msgs = $ibx->over->recent; + is(scalar(@$msgs), 0, 'inbox is still empty'); is(unlink(glob("$maildir/new/*")), 1); } @@ -117,27 +116,29 @@ More majordomo info at http://vger.kernel.org/majordomo-info.html\n); my $main_path = "$main_bin:$ENV{PATH}"; # for spamc ham mock local $ENV{PATH} = $main_path; PublicInbox::Emergency->new($maildir)->prepare(\$msg); - $config->{'publicinboxwatch.spamcheck'} = 'spamc'; - PublicInbox::WatchMaildir->new($config)->scan('full'); - ($nr, $msgs) = $srch->reopen->query(''); - is($nr, 1, 'inbox has one mail after spamc OK-ed a message'); + $cfg->{'publicinboxwatch.spamcheck'} = 'spamc'; + PublicInbox::Watch->new($cfg)->scan('full'); + my $msgs = $ibx->over->recent; + is(scalar(@$msgs), 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'); - delete $config->{'publicinboxwatch.spamcheck'}; + delete $cfg->{'publicinboxwatch.spamcheck'}; } { my $patch = 't/data/0001.patch'; open my $fh, '<', $patch or die "failed to open $patch: $!\n"; - $msg = eval { local $/; <$fh> }; + $msg = do { local $/; <$fh> }; PublicInbox::Emergency->new($maildir)->prepare(\$msg); - PublicInbox::WatchMaildir->new($config)->scan('full'); - ($nr, $msgs) = $srch->reopen->query('dfpost:6e006fd7'); - is($nr, 1, 'diff postimage found'); - my $post = $msgs->[0]; - ($nr, $msgs) = $srch->query('dfpre:090d998b6c2c'); - is($nr, 1, 'diff preimage found'); - is($post->{blob}, $msgs->[0]->{blob}, 'same message'); + PublicInbox::Watch->new($cfg)->scan('full'); + my $post = $ibx->search->reopen->mset('dfpost:6e006fd7'); + is($post->size, 1, 'diff postimage found'); + my $pre = $ibx->search->mset('dfpre:090d998b6c2c'); + is($pre->size, 1, 'diff preimage found'); + $pre = $ibx->search->mset_to_smsg($ibx, $pre); + $post = $ibx->search->mset_to_smsg($ibx, $post); + is(scalar(@$pre), 1, 'diff preimage found'); + is($post->[0]->{blob}, $pre->[0]->{blob}, 'same message'); } # multiple inboxes in the same maildir @@ -145,13 +146,13 @@ More majordomo info at http://vger.kernel.org/majordomo-info.html\n); 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 $config = PublicInbox::Config->new({ - %orig, - "$v1pfx.address" => $v1addr, - "$v1pfx.mainrepo" => $v1repo, - "$v1pfx.watch" => "maildir:$maildir", - }); + PublicInbox::Import::init_bare($v1repo); + my $raw = <new(\$raw); my $both = <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'); + PublicInbox::Watch->new($cfg)->scan('full'); + my $mset = $ibx->search->reopen->mset('m:both@b.com'); + my $msgs = $ibx->search->mset_to_smsg($ibx, $mset); + my $v1 = $cfg->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 $raw = $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 $cfg = PublicInbox::Config->new(\$raw); + PublicInbox::Watch->new($cfg)->scan('full'); + $ibx = $cfg->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'); + + $raw = $orig."$cfgpfx.watchheader=X-Mailing-List:no\@example.com\n"; + $cfg = PublicInbox::Config->new(\$raw); + PublicInbox::Watch->new($cfg)->scan('full'); + $ibx = $cfg->lookup_name('test'); + $num = $ibx->mm->num_for('do.not.want@example.com'); + ok(defined $num, 'X-Mailing-List matched'); +} + done_testing;