testcommon: spawn-aware system() and qx[] workalikes

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

diff --git a/t/nulsubject.t b/t/nulsubject.t
index bb05be8589e71ceda4875e7f88cc6cec3bfe36db..1ded88d31f435fdad0fa3d792e5079e96ca08ee1 100644 (file)
--- a/t/nulsubject.t
+++ b/t/nulsubject.t
@@ -1,19 +1,19 @@
-# Copyright (C) 2016-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-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 File::Temp qw/tempdir/;
+use PublicInbox::TestCommon;
 
 use_ok 'PublicInbox::Import';
 use_ok 'PublicInbox::Git';
-my $tmpdir = tempdir('pi-nulsubject-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($tmpdir, $for_destroy) = tmpdir();
 my $git_dir = "$tmpdir/a.git";
 
 {
-       is(system(qw(git init -q --bare), $git_dir), 0, 'git init ok');
        my $git = PublicInbox::Git->new($git_dir);
        my $im = PublicInbox::Import->new($git, 'testbox', 'test@example');
+       $im->init_bare;
        $im->add(Email::MIME->create(
                header => [
                        From => 'a@example.com',
@@ -25,7 +25,8 @@ my $git_dir = "$tmpdir/a.git";
                body => "hello world\n",
        ));
        $im->done;
-       is(system(qw(git --git-dir), $git_dir, 'fsck', '--strict'), 0, 'git fsck ok');
+       is(xsys(qw(git --git-dir), $git_dir, 'fsck', '--strict'), 0,
+               'git fsck ok');
 }
 
 done_testing();