watch: preliminary IMAP support

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

diff --git a/t/config.t b/t/config.t
index 1ec864b471d4f39de3471a6b62a04dde03d78660..3f41c0042a9e962b0628b01c05af8b2dfcc9c6ba 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 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");
 
@@ -208,20 +209,17 @@ EOF
 }
 
 {
-       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");
-               }
+               is(xqx([qw(git -c), "test.val=$t",
+                       qw(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(xqx([qw(git -c), "test.val=$f",
+                       qw(config --bool test.val)]),
+                       "false\n", "$f matches git-config behavior");
        }
        is(PublicInbox::Config::_git_config_bool('bogus'), undef,
                'bogus is undef');