-# Copyright (C) 2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2019-2020 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
use strict;
use warnings;
+use PublicInbox::TestCommon;
use Test::More;
-use File::Temp qw/tempdir/;
-use PublicInbox::MIME;
+use PublicInbox::Eml;
use PublicInbox::Config;
-my @mods = qw(Filesys::Notify::Simple DBD::SQLite Search::Xapian);
-foreach my $mod (@mods) {
- eval "require $mod";
- plan skip_all => "$mod missing for watch_filter_rubylang_v2.t" if $@;
-}
-
-use_ok 'PublicInbox::V2Writable';
-use_ok 'PublicInbox::WatchMaildir';
+require_mods(qw(DBD::SQLite Search::Xapian));
+use_ok 'PublicInbox::Watch';
use_ok 'PublicInbox::Emergency';
-my $tmpdir = tempdir('watch-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($tmpdir, $for_destroy) = tmpdir();
local $ENV{PI_CONFIG} = "$tmpdir/pi_config";
-for my $v (qw(V1 V2)) {
+my @v = qw(V1);
+SKIP: {
+ if (require_git(2.6, 1)) {
+ use_ok 'PublicInbox::V2Writable';
+ push @v, 'V2';
+ } else {
+ skip 'git 2.6+ needed for V2', 40;
+ }
+}
+
+for my $v (@v) {
my @warn;
- $SIG{__WARN__} = sub { push @warn, @_ };
+ local $SIG{__WARN__} = sub { push @warn, @_ };
my $cfgpfx = "publicinbox.$v";
- my $mainrepo = "$tmpdir/$v";
+ my $inboxdir = "$tmpdir/$v";
my $maildir = "$tmpdir/md-$v";
my $spamdir = "$tmpdir/spam-$v";
my $addr = "test-$v\@example.com";
- my @cmd = ('blib/script/public-inbox-init', "-$v", $v, $mainrepo,
+ my @cmd = ('-init', "-$v", $v, $inboxdir,
"http://example.com/$v", $addr);
- is(system(@cmd), 0, 'public-inbox init OK');
+ ok(run_script(\@cmd), 'public-inbox init OK');
if ($v eq 'V1') {
- is(system('blib/script/public-inbox-index', $mainrepo), 0);
+ ok(run_script(['-index', $inboxdir]), 'v1 indexed');
}
PublicInbox::Emergency->new($spamdir);
EOF
PublicInbox::Emergency->new($maildir)->prepare(\"$spam");
- my %orig = (
- "$cfgpfx.address" => $addr,
- "$cfgpfx.mainrepo" => $mainrepo,
- "$cfgpfx.watch" => "maildir:$maildir",
- "$cfgpfx.filter" => 'PublicInbox::Filter::RubyLang',
- "$cfgpfx.altid" => 'serial:alerts:file=msgmap.sqlite3',
- "publicinboxwatch.watchspam" => "maildir:$spamdir",
- );
- my $config = PublicInbox::Config->new({%orig});
+ my $orig = <<EOF;
+$cfgpfx.address=$addr
+$cfgpfx.inboxdir=$inboxdir
+$cfgpfx.watch=maildir:$maildir
+$cfgpfx.filter=PublicInbox::Filter::RubyLang
+$cfgpfx.altid=serial:alerts:file=msgmap.sqlite3
+publicinboxwatch.watchspam=maildir:$spamdir
+EOF
+ my $config = PublicInbox::Config->new(\$orig);
my $ibx = $config->lookup_name($v);
ok($ibx, 'found inbox by name');
- my $w = PublicInbox::WatchMaildir->new($config);
+ my $w = PublicInbox::Watch->new($config);
for my $i (1..2) {
$w->scan('full');
}
}
$w->scan('full');
- $config = PublicInbox::Config->new({%orig});
+ $config = PublicInbox::Config->new(\$orig);
$ibx = $config->lookup_name($v);
($tot, undef) = $ibx->search->reopen->query('b:spam');
is($tot, 0, 'spam removed');