my $config = PublicInbox::Config->new(\$orig);
my $ibx = $config->lookup_name('test');
ok($ibx, 'found inbox by name');
-my $srch = $ibx->search;
PublicInbox::Watch->new($config)->scan('full');
-my $total = scalar @{$srch->reopen->query('')};
+my $total = scalar @{$ibx->over->recent};
is($total, 1, 'got one revision');
# my $git = PublicInbox::Git->new("$inboxdir/git/0.git");
$write_spam->();
is(unlink(glob("$maildir/new/*")), 1, 'unlinked old spam');
PublicInbox::Watch->new($config)->scan('full');
-is_deeply($srch->reopen->query(''), [], 'deleted file');
+is_deeply($ibx->over->recent, [], 'deleted file');
is(unlink(glob("$spamdir/cur/*")), 1, 'unlinked trained spam');
# check with scrubbing
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('');
+ 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('');
+ $msgs = $ibx->over->recent;
is(scalar(@$msgs), 0, 'inbox is empty again');
is(unlink(glob("$spamdir/cur/*")), 1, 'unlinked trained spam');
}
local $SIG{__WARN__} = sub {}; # quiet spam check warning
PublicInbox::Watch->new($config)->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);
}
PublicInbox::Emergency->new($maildir)->prepare(\$msg);
$config->{'publicinboxwatch.spamcheck'} = 'spamc';
PublicInbox::Watch->new($config)->scan('full');
- my $msgs = $srch->reopen->query('');
+ 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');
$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');
+ 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
EOF
PublicInbox::Emergency->new($maildir)->prepare(\$both);
PublicInbox::Watch->new($config)->scan('full');
- my $msgs = $srch->reopen->query('m:both@b.com');
+ my $mset = $ibx->search->reopen->mset('m:both@b.com');
+ my $msgs = $ibx->search->mset_to_smsg($ibx, $mset);
my $v1 = $config->lookup_name('v1');
my $msg = $v1->git->cat_file($msgs->[0]->{blob});
is($both, $$msg, 'got original message back from v1');