about summary refs log tree commit homepage
path: root/xt/nntpd-validate.t
diff options
authorEric Wong <e@80x24.org>2019-12-22 22:17:37 +0000
committerEric Wong <e@80x24.org>2019-12-24 03:47:01 +0000
commita09f678d8254064af7ca6dcfb3c3f84b5ae37b51 (patch)
treec32233ae88dbaa3b914812a80f539054d7f086da /xt/nntpd-validate.t
parentf1259e56d75b8f06a40fb466bee51a399cc317c5 (diff)
This cuts down on lines of code in individual test cases and
fixes some misnamed error messages by using "$0" consistently.

This will also provide us with a method of swapping out
dependencies which provide equivalent functionality (e.g
"Xapian" SWIG can replace "Search::Xapian" XS bindings).
Diffstat (limited to 'xt/nntpd-validate.t')
1 files changed, 2 insertions, 6 deletions
diff --git a/xt/nntpd-validate.t b/xt/nntpd-validate.t
index c82d46e2..bf5c1ba8 100644
--- a/xt/nntpd-validate.t
+++ b/xt/nntpd-validate.t
@@ -8,16 +8,13 @@ use Test::More;
 use Symbol qw(gensym);
 use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC);
 use POSIX qw(_exit);
+use PublicInbox::TestCommon;
 my $inbox_dir = $ENV{GIANT_INBOX_DIR};
 plan skip_all => "GIANT_INBOX_DIR not defined for $0" unless $inbox_dir;
 my $mid = $ENV{TEST_MID};
 # Net::NNTP is part of the standard library, but distros may split it off...
-foreach my $mod (qw(DBD::SQLite Net::NNTP Compress::Raw::Zlib)) {
-        eval "require $mod";
-        plan skip_all => "$mod missing for $0" if $@;
+require_mods(qw(DBD::SQLite Net::NNTP Compress::Raw::Zlib));
 my $test_compress = Net::NNTP->can('compress');
 if (!$test_compress) {
         diag 'Your Net::NNTP does not yet support compression';
@@ -29,7 +26,6 @@ my $key = 'certs/server-key.pem';
 if ($test_tls && !-r $key || !-r $cert) {
         plan skip_all => "certs/ missing for $0, run $^X ./certs/create-certs.perl";
-use PublicInbox::TestCommon;
 my ($tmpdir, $ftd) = tmpdir();
 $File::Temp::KEEP_ALL = !!$ENV{TEST_KEEP_TMP};
 my (%OPT, $td, $host_port, $group);