tests: require git 2.6+ in more places

We also need to check for git 2.6 earlier in each test case,
before any other TAP output is emitted to avoid confusing the
TAP consumers.

diff --git a/t/git.t b/t/git.t
index 228df90fa45861ef0e87444ea5a057a4389e40e7..dfd7173a432c78dd9072a9530be7e1695b4ee20d 100644 (file)
--- a/t/git.t
+++ b/t/git.t
@@ -84,7 +84,8 @@ if (1) {
        ok($gcf->packed_bytes > 0, 'packed size is positive');
 }
 
-if ('alternates reloaded') {
+SKIP: {
+       require_git(2.6, 7) or skip('need git 2.6+ for --batch-all-objects', 7);
        my ($alt, $alt_obj) = tmpdir();
        my $hash_obj = [ 'git', "--git-dir=$alt", qw(hash-object -w --stdin) ];
        PublicInbox::Import::init_bare($alt);

diff --git a/t/imap.t b/t/imap.t
index 95bda4fa57c3d27a0a5ecec663c1a2d7114ca923..5a251c6b55c1f00f86f34967645044d96e399ce0 100644 (file)
--- a/t/imap.t
+++ b/t/imap.t
@@ -5,11 +5,11 @@
 use strict;
 use Test::More;
 use PublicInbox::TestCommon;
+require_git 2.6;
 require_mods(qw(DBD::SQLite Email::Address::XS||Mail::Address
        Parse::RecDescent));
 require_ok 'PublicInbox::IMAP';
 require_ok 'PublicInbox::IMAPD';
-require_git 2.6;
 
 my ($tmpdir, $for_destroy) = tmpdir();
 my $cfgfile = "$tmpdir/config";

diff --git a/t/imapd.t b/t/imapd.t
index f9d93448fe570152ad05ffdec20b15c4d614080d..ffa195d57ac61c5d984390440628e76463e8ef07 100644 (file)
--- a/t/imapd.t
+++ b/t/imapd.t
@@ -105,7 +105,7 @@ my @orig_list = @raw = $mic->list;
 like($raw[0], qr/^\* LIST \(.*?\) "\." INBOX/,
        'got an inbox');
 like($raw[-1], qr/^\S+ OK /, 'response ended with OK');
-is(scalar(@raw), scalar(@V) + 4, 'default LIST response');
+is(scalar(@raw), scalar(@V) * 2 + 2, 'default LIST response');
 @raw = $mic->list('', 'inbox.i1');
 is(scalar(@raw), 2, 'limited LIST response');
 like($raw[0], qr/^\* LIST \(.*?\) "\." INBOX/,

diff --git a/t/inbox_idle.t b/t/inbox_idle.t
index 6bd561136021a12a65b579cb025681ce2ee46471..f754e0fcc4fea508faf048af107bc463a96f8a36 100644 (file)
--- a/t/inbox_idle.t
+++ b/t/inbox_idle.t
@@ -4,10 +4,10 @@
 use Test::More;
 use PublicInbox::TestCommon;
 use PublicInbox::Config;
+require_git 2.6;
 require_mods(qw(DBD::SQLite));
 require PublicInbox::SearchIdx;
 use_ok 'PublicInbox::InboxIdle';
-require_git('2.6');
 use PublicInbox::InboxWritable;
 my ($tmpdir, $for_destroy) = tmpdir();
 

diff --git a/t/psgi_bad_mids.t b/t/psgi_bad_mids.t
index 81bd9356c56fc5c570b46a35bb66cff29a56899f..70393573e0f659ea54b330bd927cb4d01152fab4 100644 (file)
--- a/t/psgi_bad_mids.t
+++ b/t/psgi_bad_mids.t
@@ -8,6 +8,7 @@ use PublicInbox::Config;
 use PublicInbox::TestCommon;
 my @mods = qw(DBD::SQLite HTTP::Request::Common Plack::Test
                URI::Escape Plack::Builder PublicInbox::WWW);
+require_git 2.6;
 require_mods(@mods);
 use_ok($_) for @mods;
 use_ok 'PublicInbox::WWW';

diff --git a/t/psgi_multipart_not.t b/t/psgi_multipart_not.t
index e36820f4a3a39ebf93a9b6b348ff342f8af78d79..9b7fb4d022c2eaa8bed5717282c1c2d251537dd8 100644 (file)
--- a/t/psgi_multipart_not.t
+++ b/t/psgi_multipart_not.t
@@ -6,6 +6,7 @@ use Test::More;
 use PublicInbox::Eml;
 use PublicInbox::Config;
 use PublicInbox::TestCommon;
+require_git 2.6;
 my @mods = qw(DBD::SQLite Search::Xapian HTTP::Request::Common
               Plack::Test URI::Escape Plack::Builder Plack::Test);
 require_mods(@mods);

diff --git a/t/psgi_scan_all.t b/t/psgi_scan_all.t
index 46eb489f1ab0287737511c1619bbd3c7d6d1aa55..c8cb2409985e944adef2e292e78ad03b6e68247d 100644 (file)
--- a/t/psgi_scan_all.t
+++ b/t/psgi_scan_all.t
@@ -7,6 +7,7 @@ use PublicInbox::Eml;
 use PublicInbox::Config;
 use PublicInbox::TestCommon;
 my @mods = qw(HTTP::Request::Common Plack::Test URI::Escape DBD::SQLite);
+require_git 2.6;
 require_mods(@mods);
 use_ok 'PublicInbox::V2Writable';
 foreach my $mod (@mods) { use_ok $mod; }