v2writable: compatibility with SWIG Xapian binding

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

diff --git a/t/watch_maildir_v2.t b/t/watch_maildir_v2.t
index 685cd6edc2644c50e276fd46ed2714d3f3b01575..f5b8e932985076c5e413b77f3a1d0870ffdb997e 100644 (file)
--- a/t/watch_maildir_v2.t
+++ b/t/watch_maildir_v2.t
@@ -2,12 +2,13 @@
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use Test::More;
-use PublicInbox::MIME;
+use PublicInbox::Eml;
 use Cwd;
 use PublicInbox::Config;
 use PublicInbox::TestCommon;
+use PublicInbox::Import;
 require_git(2.6);
-require_mods(qw(Search::Xapian DBD::SQLite Filesys::Notify::Simple));
+require_mods(qw(Search::Xapian DBD::SQLite));
 require PublicInbox::V2Writable;
 my ($tmpdir, $for_destroy) = tmpdir();
 my $inboxdir = "$tmpdir/v2";
@@ -70,6 +71,7 @@ $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');
+is(unlink(glob("$spamdir/cur/*")), 1, 'unlinked trained spam');
 
 # check with scrubbing
 {
@@ -89,6 +91,7 @@ More majordomo info at  http://vger.kernel.org/majordomo-info.html\n);
        PublicInbox::WatchMaildir->new($config)->scan('full');
        ($nr, $msgs) = $srch->reopen->query('');
        is($nr, 0, 'inbox is empty again');
+       is(unlink(glob("$spamdir/cur/*")), 1, 'unlinked trained spam');
 }
 
 {
@@ -141,7 +144,7 @@ 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');
+       PublicInbox::Import::init_bare($v1repo);
        my $cfg2 = <<EOF;
 $orig$v1pfx.address=$v1addr
 $v1pfx.inboxdir=$v1repo