X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fconfig.t;h=ba83e63f669eae842f1d146e1a66d4b8f001bff5;hb=refs%2Fheads%2Fmaster;hp=73527ec2699bc84efe567d595ed121ece23216e8;hpb=a5968dc059f655a9ac62f1b8bf0bed2b90080b02;p=public-inbox.git
diff --git a/t/config.t b/t/config.t
index 73527ec2..ba83e63f 100644
--- a/t/config.t
+++ b/t/config.t
@@ -1,11 +1,12 @@
-# Copyright (C) 2014-2021 all contributors
+# Copyright (C) all contributors
# License: AGPL-3.0+
use strict;
-use warnings;
-use Test::More;
-use PublicInbox::Config;
+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();
{
@@ -42,7 +43,6 @@ my ($tmpdir, $for_destroy) = tmpdir();
-primary_address => 'meta@public-inbox.org',
'name' => 'meta',
-httpbackend_limiter => undef,
- nntpserver => undef,
}, "lookup matches expected output");
is($cfg->lookup('blah@example.com'), undef,
@@ -59,7 +59,6 @@ my ($tmpdir, $for_destroy) = tmpdir();
'name' => 'test',
'url' => [ 'http://example.com/test' ],
-httpbackend_limiter => undef,
- nntpserver => undef,
}, "lookup matches expected output for test");
}
@@ -98,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
@@ -235,8 +245,7 @@ EOF
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;
+ require_git('1.8.5', 2);
my $f = "$tmpdir/urlmatch";
open my $fh, '>', $f or BAIL_OUT $!;
print $fh <