X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fconfig.t;h=d08c3b9c03454bf6251ecab45083a3c4722842df;hb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;hp=a3c74fa2584771f02ffa5c21353471f32df13e66;hpb=a722d9aa28c19d82b74ccde6d94e6bdde9917f0c;p=public-inbox.git

diff --git a/t/config.t b/t/config.t
index a3c74fa2..d08c3b9c 100644
--- a/t/config.t
+++ b/t/config.t
@@ -1,11 +1,11 @@
-# Copyright (C) 2014-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2020 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;
 use PublicInbox::Config;
-use File::Temp qw/tempdir/;
-my $tmpdir = tempdir('pi-config-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+use PublicInbox::TestCommon;
+my ($tmpdir, $for_destroy) = tmpdir();
 
 {
 	is(system(qw(git init -q --bare), $tmpdir), 0, "git init successful");
@@ -24,10 +24,10 @@ 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',
+		'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,
@@ -44,11 +44,11 @@ my $tmpdir = tempdir('pi-config-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 		              'sandbox@public-inbox.org',
 			      'test@public-inbox.org'],
 		-primary_address => 'try@public-inbox.org',
-		'mainrepo' => '/home/pi/test-main.git',
+		'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");
@@ -58,30 +58,49 @@ my $tmpdir = tempdir('pi-config-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 {
 	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 $config = PublicInbox::Config->new(\<<EOF);
+$cfgpfx.address=test\@example.com
+$cfgpfx.mainrepo=/path/to/non/existent
+$cfgpfx.altid=serial:gmane:file=a
+$cfgpfx.altid=serial:enamg:file=b
+EOF
 	my $ibx = $config->lookup_name('test');
 	is_deeply($ibx->{altid}, [ @altid ]);
+
+	$config = PublicInbox::Config->new(\<<EOF);
+$cfgpfx.address=test\@example.com
+$cfgpfx.mainrepo=/path/to/non/existent
+EOF
+	$ibx = $config->lookup_name('test');
+	is($ibx->{inboxdir}, '/path/to/non/existent', 'mainrepo still works');
+
+	$config = PublicInbox::Config->new(\<<EOF);
+$cfgpfx.address=test\@example.com
+$cfgpfx.inboxdir=/path/to/non/existent
+$cfgpfx.mainrepo=/path/to/deprecated
+EOF
+	$ibx = $config->lookup_name('test');
+	is($ibx->{inboxdir}, '/path/to/non/existent',
+		'inboxdir takes precedence');
 }
 
 {
 	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 $str = <<EOF;
+$pfx.address=test\@example.com
+$pfx.inboxdir=/path/to/non/existent
+publicinbox.nntpserver=news.example.com
+EOF
+	my $cfg = PublicInbox::Config->new(\$str);
 	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);
+	$str = <<EOF;
+$pfx.address=test\@example.com
+$pfx.inboxdir=/path/to/non/existent
+$pfx.nntpserver=news.alt.example.com
+EOF
+	$cfg = PublicInbox::Config->new(\$str);
 	$ibx = $cfg->lookup_name('test');
 	is($ibx->{nntpserver}, 'news.alt.example.com','per-inbox NNTP server');
 }
@@ -90,17 +109,15 @@ my $tmpdir = tempdir('pi-config-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 {
 	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 $str = <<EOF;
+$pfx.address=test\@example.com
+$pfx.inboxdir=/path/to/non/existent
+$pfx2.address=foo\@example.com
+$pfx2.inboxdir=/path/to/foo
+publicinbox.noobfuscate=public-inbox.org \@example.com z\@EXAMPLE.com
+$pfx.obfuscate=true
+EOF
+	my $cfg = PublicInbox::Config->new(\$str);
 	my $ibx = $cfg->lookup_name('test');
 	my $re = $ibx->{-no_obfuscate_re};
 	like('meta@public-inbox.org', $re,
@@ -160,7 +177,7 @@ for my $s (@valid) {
 		push @expect, "$i";
 		print $fh <<"" or die "print: $!";
 [publicinbox "$i"]
-	mainrepo = /path/to/$i.git
+	inboxdir = /path/to/$i.git
 	address = $i\@example.com
 
 	}
@@ -174,16 +191,16 @@ for my $s (@valid) {
 {
 	my $pfx1 = "publicinbox.test1";
 	my $pfx2 = "publicinbox.test2";
-	my $h = {
-		"$pfx1.address" => 'test@example.com',
-		"$pfx1.mainrepo" => '/path/to/non/existent',
-		"$pfx2.address" => 'foo@example.com',
-		"$pfx2.mainrepo" => '/path/to/foo',
-		"$pfx1.coderepo" => 'project',
-		"$pfx2.coderepo" => 'project',
-		"coderepo.project.dir" => '/path/to/project.git',
-	};
-	my $cfg = PublicInbox::Config->new($h);
+	my $str = <<EOF;
+$pfx1.address=test\@example.com
+$pfx1.inboxdir=/path/to/non/existent
+$pfx2.address=foo\@example.com
+$pfx2.inboxdir=/path/to/foo
+$pfx1.coderepo=project
+$pfx2.coderepo=project
+coderepo.project.dir=/path/to/project.git
+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],