X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fconfig.t;h=6a6b98c80b008842167030cf770624d95dbe4b5d;hb=3d41aa23f35501ca92aab8aa42980fa73f7fa74f;hp=073d1d03074db83d6054e11991910ccee7d1b66d;hpb=b0f783fe601cfcaf89b30de461a540434f63b3ee;p=public-inbox.git

diff --git a/t/config.t b/t/config.t
index 073d1d03..6a6b98c8 100644
--- a/t/config.t
+++ b/t/config.t
@@ -1,5 +1,5 @@
-# Copyright (C) 2014-2015 all contributors <meta@public-inbox.org>
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2014-2018 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
 use Test::More;
@@ -25,12 +25,14 @@ my $tmpdir = tempdir('pi-config-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 	my $cfg = PublicInbox::Config->new($f);
 	is_deeply($cfg->lookup('meta@public-inbox.org'), {
 		'mainrepo' => '/home/pi/meta-main.git',
-		'address' => 'meta@public-inbox.org',
+		'address' => [ 'meta@public-inbox.org' ],
 		'domain' => 'public-inbox.org',
 		'url' => 'http://example.com/meta',
 		-primary_address => 'meta@public-inbox.org',
 		'name' => 'meta',
-		-pi_config => $cfg,
+		feedmax => 25,
+		-httpbackend_limiter => undef,
+		nntpserver => undef,
 	}, "lookup matches expected output");
 
 	is($cfg->lookup('blah@example.com'), undef,
@@ -45,8 +47,10 @@ my $tmpdir = tempdir('pi-config-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 		'mainrepo' => '/home/pi/test-main.git',
 		'domain' => 'public-inbox.org',
 		'name' => 'test',
+		feedmax => 25,
 		'url' => 'http://example.com/test',
-		-pi_config => $cfg,
+		-httpbackend_limiter => undef,
+		nntpserver => undef,
 	}, "lookup matches expected output for test");
 }
 
@@ -63,4 +67,51 @@ my $tmpdir = tempdir('pi-config-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 	is_deeply($ibx->{altid}, [ @altid ]);
 }
 
+{
+	my $pfx = "publicinbox.test";
+	my %h = (
+		"$pfx.address" => 'test@example.com',
+		"$pfx.mainrepo" => '/path/to/non/existent',
+		"publicinbox.nntpserver" => 'news.example.com',
+	);
+	my %tmp = %h;
+	my $cfg = PublicInbox::Config->new(\%tmp);
+	my $ibx = $cfg->lookup_name('test');
+	is($ibx->{nntpserver}, 'news.example.com', 'global NNTP server');
+
+	delete $h{'publicinbox.nntpserver'};
+	$h{"$pfx.nntpserver"} = 'news.alt.example.com';
+	$cfg = PublicInbox::Config->new(\%h);
+	$ibx = $cfg->lookup_name('test');
+	is($ibx->{nntpserver}, 'news.alt.example.com','per-inbox NNTP server');
+}
+
+# no obfuscate domains
+{
+	my $pfx = "publicinbox.test";
+	my $pfx2 = "publicinbox.foo";
+	my %h = (
+		"$pfx.address" => 'test@example.com',
+		"$pfx.mainrepo" => '/path/to/non/existent',
+		"$pfx2.address" => 'foo@example.com',
+		"$pfx2.mainrepo" => '/path/to/foo',
+		lc("publicinbox.noObfuscate") =>
+			'public-inbox.org @example.com z@EXAMPLE.com',
+		"$pfx.obfuscate" => 'true', # :<
+	);
+	my %tmp = %h;
+	my $cfg = PublicInbox::Config->new(\%tmp);
+	my $ibx = $cfg->lookup_name('test');
+	my $re = $ibx->{-no_obfuscate_re};
+	like('meta@public-inbox.org', $re,
+		'public-inbox.org address not to be obfuscated');
+	like('t@example.com', $re, 'example.com address not to be obfuscated');
+	unlike('t@example.comM', $re, 'example.comM address does not match');
+	is_deeply($ibx->{-no_obfuscate}, {
+			'test@example.com' => 1,
+			'foo@example.com' => 1,
+			'z@example.com' => 1,
+		}, 'known addresses populated');
+}
+
 done_testing();