treewide: run update-copyrights from gnulib for 2019

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

diff --git a/t/watch_filter_rubylang.t b/t/watch_filter_rubylang.t
index 4b88d670e84382f611ad6f047d76642ab68eec36..b4540660a79135659821c34276978d9427271b69 100644 (file)
--- a/t/watch_filter_rubylang.t
+++ b/t/watch_filter_rubylang.t
@@ -1,21 +1,15 @@
-# 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;
-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);
@@ -36,11 +30,11 @@ for my $v (@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, $inboxdir,
+       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', $inboxdir), 0);
+               ok(run_script(['-index', $inboxdir]), 'v1 indexed');
        }
        PublicInbox::Emergency->new($spamdir);