X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=t%2Fwatch_maildir_v2.t;h=7b46232b36beab4473437f0505b3db5ab705396a;hp=ca1cf9656889934c8b60b7dcb406376d7189185f;hb=4eee5af6011cc8cdefb66c9729952c7eff5c0b0b;hpb=cee907599bb7eda0695ae91cf8d633670a88d6c7 diff --git a/t/watch_maildir_v2.t b/t/watch_maildir_v2.t index ca1cf965..7b46232b 100644 --- a/t/watch_maildir_v2.t +++ b/t/watch_maildir_v2.t @@ -1,4 +1,4 @@ -# Copyright (C) 2018-2020 all contributors +# Copyright (C) 2018-2021 all contributors # License: AGPL-3.0+ use strict; use Test::More; @@ -44,13 +44,13 @@ $cfgpfx.watch=maildir:$maildir $cfgpfx.filter=PublicInbox::Filter::Vger publicinboxlearn.watchspam=maildir:$spamdir EOF -my $config = PublicInbox::Config->new(\$orig); -my $ibx = $config->lookup_name('test'); +my $cfg = PublicInbox::Config->new(\$orig); +my $ibx = $cfg->lookup_name('test'); ok($ibx, 'found inbox by name'); -my $srch = $ibx->search; +$ibx->{-no_fsync} = 1; -PublicInbox::Watch->new($config)->scan('full'); -my $total = scalar @{$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("$inboxdir/git/0.git"); @@ -69,8 +69,8 @@ my $write_spam = sub { }; $write_spam->(); is(unlink(glob("$maildir/new/*")), 1, 'unlinked old spam'); -PublicInbox::Watch->new($config)->scan('full'); -is_deeply($srch->reopen->query(''), [], '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 @@ -80,16 +80,16 @@ 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::Watch->new($config)->scan('full'); - my $msgs = $srch->reopen->query(''); + 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::Watch->new($config)->scan('full'); - $msgs = $srch->reopen->query(''); + 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'); } @@ -100,12 +100,12 @@ 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::Watch->new($config)->scan('full'); + PublicInbox::Watch->new($cfg)->scan('full'); } - my $msgs = $srch->reopen->query(''); + my $msgs = $ibx->over->recent; is(scalar(@$msgs), 0, 'inbox is still empty'); is(unlink(glob("$maildir/new/*")), 1); } @@ -116,13 +116,13 @@ 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::Watch->new($config)->scan('full'); - my $msgs = $srch->reopen->query(''); + $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'}; } { @@ -130,13 +130,15 @@ More majordomo info at http://vger.kernel.org/majordomo-info.html\n); open my $fh, '<', $patch or die "failed to open $patch: $!\n"; $msg = do { local $/; <$fh> }; PublicInbox::Emergency->new($maildir)->prepare(\$msg); - PublicInbox::Watch->new($config)->scan('full'); - my $msgs = $srch->reopen->query('dfpost:6e006fd7'); - is(scalar(@$msgs), 1, 'diff postimage found'); - my $post = $msgs->[0]; - $msgs = $srch->query('dfpre:090d998b6c2c'); - is(scalar(@$msgs), 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,12 +147,12 @@ More majordomo info at http://vger.kernel.org/majordomo-info.html\n); my $v1pfx = "publicinbox.v1"; my $v1addr = 'v1-public@example.com'; PublicInbox::Import::init_bare($v1repo); - my $cfg2 = <new(\$cfg2); + my $cfg = PublicInbox::Config->new(\$raw); my $both = <new($maildir)->prepare(\$both); - PublicInbox::Watch->new($config)->scan('full'); - my $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}); @@ -182,21 +185,21 @@ List-Id: X-Mailing-List: no@example.com Message-ID: EOF - my $cfg = $orig."$cfgpfx.listid=i.want.you.to.want.me\n"; + 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 $config = PublicInbox::Config->new(\$cfg); - PublicInbox::Watch->new($config)->scan('full'); - $ibx = $config->lookup_name('test'); + 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'); - $cfg = $orig."$cfgpfx.watchheader=X-Mailing-List:no\@example.com\n"; - $config = PublicInbox::Config->new(\$cfg); - PublicInbox::Watch->new($config)->scan('full'); - $ibx = $config->lookup_name('test'); + $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'); }