update copyrights for 2021

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

diff --git a/t/config.t b/t/config.t
index d7fd94460dd052d982bd35473b5f7dd2486a70e8..fe6841069f944b31340c463fc43ff10cbf31a1b4 100644 (file)
--- a/t/config.t
+++ b/t/config.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
@@ -41,7 +41,6 @@ my ($tmpdir, $for_destroy) = tmpdir();
                'url' => [ 'http://example.com/meta' ],
                -primary_address => 'meta@public-inbox.org',
                'name' => 'meta',
-               feedmax => 25,
                -httpbackend_limiter => undef,
                nntpserver => undef,
        }, "lookup matches expected output");
@@ -58,7 +57,6 @@ my ($tmpdir, $for_destroy) = tmpdir();
                'inboxdir' => '/home/pi/test-main.git',
                'domain' => 'public-inbox.org',
                'name' => 'test',
-               feedmax => 25,
                'url' => [ 'http://example.com/test' ],
                -httpbackend_limiter => undef,
                nntpserver => undef,
@@ -220,28 +218,29 @@ EOF
 
 {
        for my $t (qw(TRUE true yes on 1 +1 -1 13 0x1 0x12 0X5)) {
-               is(PublicInbox::Config::_git_config_bool($t), 1, "$t is true");
+               is(PublicInbox::Config::git_bool($t), 1, "$t is true");
                is(xqx([qw(git -c), "test.val=$t",
                        qw(config --bool test.val)]),
                        "true\n", "$t matches git-config behavior");
        }
        for my $f (qw(FALSE false no off 0 +0 +000 00 0x00 0X0)) {
-               is(PublicInbox::Config::_git_config_bool($f), 0, "$f is false");
+               is(PublicInbox::Config::git_bool($f), 0, "$f is false");
                is(xqx([qw(git -c), "test.val=$f",
                        qw(config --bool test.val)]),
                        "false\n", "$f matches git-config behavior");
        }
-       is(PublicInbox::Config::_git_config_bool('bogus'), undef,
+       is(PublicInbox::Config::git_bool('bogus'), undef,
                'bogus is undef');
 }
 
 SKIP: {
+       # XXX wildcard match requires git 2.26+
        require_git('1.8.5', 2) or
                skip 'git 1.8.5+ required for --url-match', 2;
        my $f = "$tmpdir/urlmatch";
        open my $fh, '>', $f or BAIL_OUT $!;
        print $fh <<EOF or BAIL_OUT $!;
-[imap "imap://*.example.com"]
+[imap "imap://mail.example.com"]
        pollInterval = 9
 EOF
        close $fh or BAIL_OUT;