t/httpd-unix: FreeBSD expects to fail with EADDRINUSE

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

diff --git a/t/watch_maildir_v2.t b/t/watch_maildir_v2.t
index 7fe235211a98f46602e72ea6b4be4e64889e2cb3..53f1bdfc8128c1effa29ae812ce104f7ecac0871 100644 (file)
--- a/t/watch_maildir_v2.t
+++ b/t/watch_maildir_v2.t
@@ -1,7 +1,7 @@
 # Copyright (C) 2018-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+use strict;
 use Test::More;
-use File::Temp qw/tempdir/;
 use PublicInbox::MIME;
 use Cwd;
 use PublicInbox::Config;
@@ -13,7 +13,7 @@ foreach my $mod (@mods) {
        plan skip_all => "$mod missing for watch_maildir_v2.t" if $@;
 }
 require PublicInbox::V2Writable;
-my $tmpdir = tempdir('watch_maildir-v2-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($tmpdir, $for_destroy) = tmpdir();
 my $inboxdir = "$tmpdir/v2";
 my $maildir = "$tmpdir/md";
 my $spamdir = "$tmpdir/spam";
@@ -106,7 +106,7 @@ More majordomo info at  http://vger.kernel.org/majordomo-info.html\n);
                local $SIG{__WARN__} = sub {}; # quiet spam check warning
                PublicInbox::WatchMaildir->new($config)->scan('full');
        }
-       ($nr, $msgs) = $srch->reopen->query('');
+       my ($nr, $msgs) = $srch->reopen->query('');
        is($nr, 0, 'inbox is still empty');
        is(unlink(glob("$maildir/new/*")), 1);
 }
@@ -119,7 +119,7 @@ More majordomo info at  http://vger.kernel.org/majordomo-info.html\n);
        PublicInbox::Emergency->new($maildir)->prepare(\$msg);
        $config->{'publicinboxwatch.spamcheck'} = 'spamc';
        PublicInbox::WatchMaildir->new($config)->scan('full');
-       ($nr, $msgs) = $srch->reopen->query('');
+       my ($nr, $msgs) = $srch->reopen->query('');
        is($nr, 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');
@@ -132,7 +132,7 @@ More majordomo info at  http://vger.kernel.org/majordomo-info.html\n);
        $msg = eval { local $/; <$fh> };
        PublicInbox::Emergency->new($maildir)->prepare(\$msg);
        PublicInbox::WatchMaildir->new($config)->scan('full');
-       ($nr, $msgs) = $srch->reopen->query('dfpost:6e006fd7');
+       my ($nr, $msgs) = $srch->reopen->query('dfpost:6e006fd7');
        is($nr, 1, 'diff postimage found');
        my $post = $msgs->[0];
        ($nr, $msgs) = $srch->query('dfpre:090d998b6c2c');