X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fconfig.t;h=7e753cbe1bf2d5ad7a7afaf7389c040a4a73da5f;hb=4452b5ebd8f202d72260325768512230c93ef6f2;hp=0866f264e151bffcabda1f9d1bb9055bdc48d33f;hpb=fece7fca6aeac74410a813cffcb0da338017d0ed;p=public-inbox.git
diff --git a/t/config.t b/t/config.t
index 0866f264..7e753cbe 100644
--- a/t/config.t
+++ b/t/config.t
@@ -1,21 +1,33 @@
-# Copyright (C) 2014-2019 all contributors
+# Copyright (C) 2014-2021 all contributors
# License: AGPL-3.0+
use strict;
-use warnings;
-use Test::More;
-use PublicInbox::Config;
-use File::Temp qw/tempdir/;
-my $tmpdir = tempdir('pi-config-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+use v5.10.1;
+use PublicInbox::TestCommon;
+use PublicInbox::Import;
+use_ok 'PublicInbox';
+ok(defined(eval('$PublicInbox::VERSION')), 'VERSION defined');
+use_ok 'PublicInbox::Config';
+my ($tmpdir, $for_destroy) = tmpdir();
{
- is(system(qw(git init -q --bare), $tmpdir), 0, "git init successful");
- my @cmd = ('git', "--git-dir=$tmpdir", qw(config foo.bar), "hi\nhi");
- is(system(@cmd), 0, "set config");
+ PublicInbox::Import::init_bare($tmpdir);
+ my $inboxdir = "$tmpdir/new\nline";
+ my @cmd = ('git', "--git-dir=$tmpdir",
+ qw(config publicinbox.foo.inboxdir), $inboxdir);
+ is(xsys(@cmd), 0, "set config");
my $tmp = PublicInbox::Config->new("$tmpdir/config");
- is("hi\nhi", $tmp->{"foo.bar"}, "config read correctly");
- is("true", $tmp->{"core.bare"}, "used --bare repo");
+ is($tmp->{'publicinbox.foo.inboxdir'}, $inboxdir,
+ 'config read correctly');
+ is($tmp->{'core.bare'}, 'true', 'init used --bare repo');
+
+ my @warn;
+ local $SIG{__WARN__} = sub { push @warn, @_ };
+ $tmp = PublicInbox::Config->new("$tmpdir/config");
+ is($tmp->lookup_name('foo'), undef, 'reject invalid inboxdir');
+ like("@warn", qr/^E:.*must not contain `\\n'/sm,
+ 'warned about newline');
}
{
@@ -27,12 +39,10 @@ my $tmpdir = tempdir('pi-config-XXXXXX', TMPDIR => 1, CLEANUP => 1);
'inboxdir' => '/home/pi/meta-main.git',
'address' => [ 'meta@public-inbox.org' ],
'domain' => 'public-inbox.org',
- 'url' => 'http://example.com/meta',
+ 'url' => [ 'http://example.com/meta' ],
-primary_address => 'meta@public-inbox.org',
'name' => 'meta',
- feedmax => 25,
-httpbackend_limiter => undef,
- nntpserver => undef,
}, "lookup matches expected output");
is($cfg->lookup('blah@example.com'), undef,
@@ -47,10 +57,8 @@ my $tmpdir = tempdir('pi-config-XXXXXX', TMPDIR => 1, CLEANUP => 1);
'inboxdir' => '/home/pi/test-main.git',
'domain' => 'public-inbox.org',
'name' => 'test',
- feedmax => 25,
- 'url' => 'http://example.com/test',
+ 'url' => [ 'http://example.com/test' ],
-httpbackend_limiter => undef,
- nntpserver => undef,
}, "lookup matches expected output for test");
}
@@ -89,20 +97,31 @@ EOF
my $str = <new(\$str);
my $ibx = $cfg->lookup_name('test');
- is($ibx->{nntpserver}, 'news.example.com', 'global NNTP server');
+ is_deeply($ibx->nntp_url({ www => { pi_cfg => $cfg }}),
+ [ 'nntp://news.example.com/inbox.test' ],
+ 'nntp_url uses global NNTP server');
$str = <new(\$str);
$ibx = $cfg->lookup_name('test');
- is($ibx->{nntpserver}, 'news.alt.example.com','per-inbox NNTP server');
+ is_deeply($ibx->nntp_url({ www => { pi_cfg => $cfg }}),
+ [ 'nntp://news.alt.example.com/inbox.test' ],
+ 'nntp_url uses per-inbox NNTP server');
+ is_deeply($ibx->imap_url({ www => { pi_cfg => $cfg }}),
+ [ 'imaps://mail.example.com/inbox.test' ],
+ 'nntp_url uses per-inbox NNTP server');
}
# no obfuscate domains
@@ -150,7 +169,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
@@ -166,7 +185,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");
}
{
@@ -203,28 +222,44 @@ 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');
}
{
- my $check_git = !!$ENV{CHECK_GIT_BOOL};
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");
- if ($check_git) {
- is(`git -c test.val=$t config --bool test.val`,
- "true\n", "$t matches git-config behavior");
- }
+ 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");
- if ($check_git) {
- is(`git -c test.val=$f config --bool test.val`,
- "false\n", "$f matches git-config behavior");
- }
+ 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 <new;
+ my $url = 'imap://mail.example.com/INBOX';
+ is($cfg->urlmatch('imap.pollInterval', $url), 9, 'urlmatch hit');
+ is($cfg->urlmatch('imap.idleInterval', $url), undef, 'urlmatch miss');
+};
+
+
done_testing();