X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fconfig.t;h=d08c3b9c03454bf6251ecab45083a3c4722842df;hb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;hp=7531fd7552aac14d88855e3f163e12d564264ecb;hpb=cfa8ff7c256e20f3240aed5f98d155c019788e3b;p=public-inbox.git diff --git a/t/config.t b/t/config.t index 7531fd75..d08c3b9c 100644 --- a/t/config.t +++ b/t/config.t @@ -1,20 +1,20 @@ -# Copyright (C) 2014-2018 all contributors +# Copyright (C) 2014-2020 all contributors # License: AGPL-3.0+ 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"); - my @cmd = ('git', "--git-dir=$tmpdir", qw(config foo.bar hihi)); + my @cmd = ('git', "--git-dir=$tmpdir", qw(config foo.bar), "hi\nhi"); is(system(@cmd), 0, "set config"); my $tmp = PublicInbox::Config->new("$tmpdir/config"); - is("hihi", $tmp->{"foo.bar"}, "config read correctly"); + is("hi\nhi", $tmp->{"foo.bar"}, "config read correctly"); is("true", $tmp->{"core.bare"}, "used --bare repo"); } @@ -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(\<lookup_name('test'); is_deeply($ibx->{altid}, [ @altid ]); + + $config = PublicInbox::Config->new(\<lookup_name('test'); + is($ibx->{inboxdir}, '/path/to/non/existent', 'mainrepo still works'); + + $config = PublicInbox::Config->new(\<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 = <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 = <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 = <new(\$str); my $ibx = $cfg->lookup_name('test'); my $re = $ibx->{-no_obfuscate_re}; like('meta@public-inbox.org', $re, @@ -127,10 +144,13 @@ my @invalid = ( ); -require Data::Dumper; +my %X = ("\0" => '\\0', "\b" => '\\b', "\f" => '\\f', "'" => "\\'"); +my $xre = join('|', keys %X); + for my $s (@invalid) { - my $d = Data::Dumper->new([$s])->Terse(1)->Indent(0)->Dump; - ok(!PublicInbox::Config::valid_inbox_name($s), "$d name rejected"); + my $d = $s; + $d =~ s/($xre)/$X{$1}/g; + ok(!PublicInbox::Config::valid_inbox_name($s), "`$d' name rejected"); } # obviously-valid examples @@ -146,8 +166,7 @@ my @valid = qw(a a@example a@example.com); # '!', '$', '=', '+' push @valid, qw[bang! ca$h less< more> 1% (parens) &more eql= +plus], '#hash'; for my $s (@valid) { - my $d = Data::Dumper->new([$s])->Terse(1)->Indent(0)->Dump; - ok(PublicInbox::Config::valid_inbox_name($s), "$d name accepted"); + ok(PublicInbox::Config::valid_inbox_name($s), "`$s' name accepted"); } { @@ -158,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 } @@ -169,4 +188,43 @@ for my $s (@valid) { is_deeply(\@result, \@expect); } +{ + my $pfx1 = "publicinbox.test1"; + my $pfx2 = "publicinbox.test2"; + my $str = <new(\$str); + my $t1 = $cfg->lookup_name('test1'); + my $t2 = $cfg->lookup_name('test2'); + is($t1->{-repo_objs}->[0], $t2->{-repo_objs}->[0], + 'inboxes share ::Git object'); +} + +{ + my $check_git = !!$ENV{CHECK_GIT_BOOL}; + for my $t (qw(TRUE true yes on 1 +1 -1 13 0x1 0x12 0X5)) { + is(PublicInbox::Config::_git_config_bool($t), 1, "$t is true"); + if ($check_git) { + is(`git -c test.val=$t config --bool test.val`, + "true\n", "$t matches git-config behavior"); + } + } + for my $f (qw(FALSE false no off 0 +0 +000 00 0x00 0X0)) { + is(PublicInbox::Config::_git_config_bool($f), 0, "$f is false"); + if ($check_git) { + is(`git -c test.val=$f config --bool test.val`, + "false\n", "$f matches git-config behavior"); + } + } + is(PublicInbox::Config::_git_config_bool('bogus'), undef, + 'bogus is undef'); +} + done_testing();