testcommon: add require_mods method and use it

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

diff --git a/t/psgi_v2.t b/t/psgi_v2.t
index c7550e2d1e84355e6cc17c41e5ec3af80f98b2b1..9a81ee9ada54a3c227ce849ee3bb02162c3d6a6f 100644 (file)
--- a/t/psgi_v2.t
+++ b/t/psgi_v2.t
@@ -3,22 +3,18 @@
 use strict;
 use warnings;
 use Test::More;
-require './t/common.perl';
+use PublicInbox::TestCommon;
 require_git(2.6);
-use File::Temp qw/tempdir/;
 use PublicInbox::MIME;
 use PublicInbox::Config;
 use PublicInbox::WWW;
 use PublicInbox::MID qw(mids);
 my @mods = qw(DBD::SQLite Search::Xapian HTTP::Request::Common Plack::Test
                URI::Escape Plack::Builder);
-foreach my $mod (@mods) {
-       eval "require $mod";
-       plan skip_all => "$mod missing for psgi_v2_dupes.t" if $@;
-}
+require_mods(@mods);
 use_ok($_) for @mods;
 use_ok 'PublicInbox::V2Writable';
-my $inboxdir = tempdir('pi-v2_dupes-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($inboxdir, $for_destroy) = tmpdir();
 my $ibx = {
        inboxdir => $inboxdir,
        name => 'test-v2writable',
@@ -156,7 +152,7 @@ test_psgi(sub { $www->call(@_) }, sub {
        is($res->code, 200, 'success with threaded search');
        my $raw = $res->content;
        ok($raw =~ s/\A.*>Results 1-3 of 3\b//s, 'got all results');
-       my @over = ($raw =~ m/\d{4}-\d+-\d+\s+\d+:\d+ (.+)$/gm);
+       my @over = ($raw =~ m/\d{4}-\d+-\d+\s+\d+:\d+ +(?:\d+\% )?(.+)$/gm);
        is_deeply(\@over, [ '<a', '` <a', '` <a' ], 'threaded messages show up');
 
        local $SIG{__WARN__} = 'DEFAULT';