From: Eric Wong <e@80x24.org>
Date: Wed, 10 Feb 2021 21:50:48 +0000 (+0000)
Subject: tests: skip properly with git <2.6
X-Git-Tag: v1.7.0~1132
X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=commitdiff_plain;h=7a1fe192b9f63f057a21cb60c5e0e85b2ca34d50

tests: skip properly with git <2.6

Tested with git 1.8.3.1 on CentOS 7.x

`plan skip_all => ...' doesn't work after some tests have run,
we have to call skip() instead.
---

diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index f5b3fae4..d6b7d20e 100644
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -476,7 +476,7 @@ sub test_lei {
 SKIP: {
 	my ($cb) = pop @_;
 	my $test_opt = shift // {};
-	require_git(2.6) or skip('git 2.6+ required for lei test', 2);
+	require_git(2.6, 1) or skip('git 2.6+ required for lei test', 2);
 	require_mods(qw(json DBD::SQLite Search::Xapian), 2);
 	require PublicInbox::Config;
 	delete local $ENV{XDG_DATA_HOME};
diff --git a/t/nntpd.t b/t/nntpd.t
index 6c100138..18aaccbe 100644
--- a/t/nntpd.t
+++ b/t/nntpd.t
@@ -13,11 +13,11 @@ use Net::NNTP;
 use Sys::Hostname;
 use POSIX qw(_exit);
 use Digest::SHA;
-use_ok 'PublicInbox::Msgmap';
 
 # t/nntpd-v2.t wraps this for v2
 my $version = $ENV{PI_TEST_VERSION} || 1;
 require_git('2.6') if $version == 2;
+use_ok 'PublicInbox::Msgmap';
 my $lsof = which('lsof');
 my $fast_idle = eval { require Linux::Inotify2; 1 } //
 		eval { require IO::KQueue; 1 };