X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fconfig.t;h=353dac69b56e081bc3ee233656ca16911a54ae9b;hb=956ede734d7c2e8d0a3003c6e2d554114586643e;hp=7a63aa7639e651f3e072d4064e684c00083d45c3;hpb=f850effe0baef8a37ad2eef3ef581b79539cc304;p=public-inbox.git

diff --git a/t/config.t b/t/config.t
index 7a63aa76..353dac69 100644
--- a/t/config.t
+++ b/t/config.t
@@ -9,10 +9,8 @@ my $tmpdir = tempdir('pi-config-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 
 {
 	is(system(qw(git init -q --bare), $tmpdir), 0, "git init successful");
-	{
-		local $ENV{GIT_DIR} = $tmpdir;
-		is(system(qw(git config foo.bar hihi)), 0, "set config");
-	}
+	my @cmd = ('git', "--git-dir=$tmpdir", qw(config foo.bar hihi));
+	is(system(@cmd), 0, "set config");
 
 	my $tmp = PublicInbox::Config->new("$tmpdir/config");
 
@@ -27,9 +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',
-		'inbox' => 'meta',
+		'name' => 'meta',
+		feedmax => 25,
+		-httpbackend_limiter => undef,
+		nntpserver => undef,
 	}, "lookup matches expected output");
 
 	is($cfg->lookup('blah@example.com'), undef,
@@ -42,8 +45,73 @@ my $tmpdir = tempdir('pi-config-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 			      'test@public-inbox.org'],
 		-primary_address => 'try@public-inbox.org',
 		'mainrepo' => '/home/pi/test-main.git',
-		'inbox' => 'test',
+		'domain' => 'public-inbox.org',
+		'name' => 'test',
+		feedmax => 25,
+		'url' => 'http://example.com/test',
+		-httpbackend_limiter => undef,
+		nntpserver => undef,
 	}, "lookup matches expected output for test");
 }
 
+
+{
+	my $cfgpfx = "publicinbox.test";
+	my @altid = qw(serial:gmane:file=a serial:enamg:file=b);
+	my $config = PublicInbox::Config->new({
+		"$cfgpfx.address" => 'test@example.com',
+		"$cfgpfx.mainrepo" => '/path/to/non/existent',
+		"$cfgpfx.altid" => [ @altid ],
+	});
+	my $ibx = $config->lookup_name('test');
+	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();