X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fconfig.t;h=437f1d145b868d35854ae54e2e3ef021590d2e79;hb=bde2d8c8de65a4d6b06e8d7365f504f2d8db90a6;hp=d4700fc9b009e73e874ab8024acd6a1b828b9231;hpb=788db1ec53c00b1a1a9457dc156bc7990736e88e;p=public-inbox.git

diff --git a/t/config.t b/t/config.t
index d4700fc9..437f1d14 100644
--- a/t/config.t
+++ b/t/config.t
@@ -1,18 +1,16 @@
-# Copyright (C) 2014, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2014-2015 all contributors <meta@public-inbox.org>
 # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
 use strict;
 use warnings;
 use Test::More;
 use PublicInbox::Config;
 use File::Temp qw/tempdir/;
-my $tmpdir = tempdir(CLEANUP => 1);
+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(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',
-		'listname' => 'meta',
+		'name' => 'meta',
+		feedmax => 25,
+		-httpbackend_limiter => undef,
+		nntpserver => undef,
 	}, "lookup matches expected output");
 
 	is($cfg->lookup('blah@example.com'), undef,
@@ -42,8 +45,45 @@ my $tmpdir = tempdir(CLEANUP => 1);
 			      'test@public-inbox.org'],
 		-primary_address => 'try@public-inbox.org',
 		'mainrepo' => '/home/pi/test-main.git',
-		'listname' => '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');
+}
+
 done_testing();