X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fconfig.t;h=73527ec2699bc84efe567d595ed121ece23216e8;hb=a5968dc059f655a9ac62f1b8bf0bed2b90080b02;hp=d7fd94460dd052d982bd35473b5f7dd2486a70e8;hpb=d87dd0e6795870439422ee4f0039d0d76d1974b3;p=public-inbox.git
diff --git a/t/config.t b/t/config.t
index d7fd9446..73527ec2 100644
--- a/t/config.t
+++ b/t/config.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2020 all contributors
+# Copyright (C) 2014-2021 all contributors
# License: AGPL-3.0+
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,
@@ -161,7 +159,7 @@ my $xre = join('|', keys %X);
for my $s (@invalid) {
my $d = $s;
$d =~ s/($xre)/$X{$1}/g;
- ok(!PublicInbox::Config::valid_inbox_name($s), "`$d' name rejected");
+ ok(!PublicInbox::Config::valid_foo_name($s), "`$d' name rejected");
}
# obviously-valid examples
@@ -177,7 +175,7 @@ my @valid = qw(a a@example a@example.com);
# '!', '$', '=', '+'
push @valid, qw[bang! ca$h less< more> 1% (parens) &more eql= +plus], '#hash';
for my $s (@valid) {
- ok(PublicInbox::Config::valid_inbox_name($s), "`$s' name accepted");
+ ok(PublicInbox::Config::valid_foo_name($s), "`$s' name accepted");
}
{
@@ -214,34 +212,35 @@ EOF
my $cfg = PublicInbox::Config->new(\$str);
my $t1 = $cfg->lookup_name('test1');
my $t2 = $cfg->lookup_name('test2');
- is($t1->{-repo_objs}->[0], $t2->{-repo_objs}->[0],
+ is($cfg->repo_objs($t1)->[0], $cfg->repo_objs($t2)->[0],
'inboxes share ::Git object');
}
{
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 <