t/feed: remove useless $ENV{GIT_DIR} assignment

[public-inbox.git] / t / config.t

diff --git a/t/config.t b/t/config.t
index 3b4b12b32c20715ccfa60c6a665b43da9036212a..1f50bb86a0963bd5ac63e0817701a45c796846a5 100644 (file)
--- a/t/config.t
+++ b/t/config.t
@@ -1,16 +1,17 @@
-# 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;
+use PublicInbox::Import;
+my ($tmpdir, $for_destroy) = tmpdir();
 
 {
-       is(system(qw(git init -q --bare), $tmpdir), 0, "git init successful");
+       PublicInbox::Import::init_bare($tmpdir);
        my @cmd = ('git', "--git-dir=$tmpdir", qw(config foo.bar), "hi\nhi");
-       is(system(@cmd), 0, "set config");
+       is(xsys(@cmd), 0, "set config");
 
        my $tmp = PublicInbox::Config->new("$tmpdir/config");
 
@@ -24,10 +25,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 +45,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");
@@ -66,13 +67,29 @@ $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 $str = <<EOF;
 $pfx.address=test\@example.com
-$pfx.mainrepo=/path/to/non/existent
+$pfx.inboxdir=/path/to/non/existent
 publicinbox.nntpserver=news.example.com
 EOF
        my $cfg = PublicInbox::Config->new(\$str);
@@ -81,7 +98,7 @@ EOF
 
        $str = <<EOF;
 $pfx.address=test\@example.com
-$pfx.mainrepo=/path/to/non/existent
+$pfx.inboxdir=/path/to/non/existent
 $pfx.nntpserver=news.alt.example.com
 EOF
        $cfg = PublicInbox::Config->new(\$str);
@@ -95,9 +112,9 @@ EOF
        my $pfx2 = "publicinbox.foo";
        my $str = <<EOF;
 $pfx.address=test\@example.com
-$pfx.mainrepo=/path/to/non/existent
+$pfx.inboxdir=/path/to/non/existent
 $pfx2.address=foo\@example.com
-$pfx2.mainrepo=/path/to/foo
+$pfx2.inboxdir=/path/to/foo
 publicinbox.noobfuscate=public-inbox.org \@example.com z\@EXAMPLE.com
 $pfx.obfuscate=true
 EOF
@@ -161,7 +178,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
 
        }
@@ -177,9 +194,9 @@ for my $s (@valid) {
        my $pfx2 = "publicinbox.test2";
        my $str = <<EOF;
 $pfx1.address=test\@example.com
-$pfx1.mainrepo=/path/to/non/existent
+$pfx1.inboxdir=/path/to/non/existent
 $pfx2.address=foo\@example.com
-$pfx2.mainrepo=/path/to/foo
+$pfx2.inboxdir=/path/to/foo
 $pfx1.coderepo=project
 $pfx2.coderepo=project
 coderepo.project.dir=/path/to/project.git