X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fwatch_filter_rubylang.t;h=b4540660a79135659821c34276978d9427271b69;hb=6ebcec3add4d6aeff6e3b3eb019a404528c079ec;hp=b28d699aa24455a25f22e64b0f5704e72d66d288;hpb=1317fb7b4ace03f6d9dfb1a42ee5f9371a1bf913;p=public-inbox.git
diff --git a/t/watch_filter_rubylang.t b/t/watch_filter_rubylang.t
index b28d699a..b4540660 100644
--- a/t/watch_filter_rubylang.t
+++ b/t/watch_filter_rubylang.t
@@ -1,21 +1,15 @@
-# Copyright (C) 2019 all contributors
+# Copyright (C) 2019-2020 all contributors
# License: AGPL-3.0+
use strict;
use warnings;
-require './t/common.perl';
+use PublicInbox::TestCommon;
use Test::More;
-use File::Temp qw/tempdir/;
use PublicInbox::MIME;
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 $@;
-}
-
+require_mods(qw(Filesys::Notify::Simple DBD::SQLite Search::Xapian));
use_ok 'PublicInbox::WatchMaildir';
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";
my @v = qw(V1);
@@ -32,15 +26,15 @@ for my $v (@v) {
my @warn;
$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);
@@ -72,7 +66,7 @@ EOF
my $orig = <