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

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

diff --git a/t/git.t b/t/git.t
index a496f851c3219033ff5524b9163d6d49f033cfb3..b05ac123bec6a342204726b838a235253799cfb1 100644 (file)
--- a/t/git.t
+++ b/t/git.t
@@ -1,20 +1,22 @@
-# Copyright (C) 2015-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-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/;
-my $dir = tempdir('pi-git-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+use PublicInbox::TestCommon;
+my ($dir, $for_destroy) = tmpdir();
 use PublicInbox::Spawn qw(popen_rd);
+use PublicInbox::Import;
 
 use_ok 'PublicInbox::Git';
 
 {
-       is(system(qw(git init -q --bare), $dir), 0, 'created git directory');
+       PublicInbox::Import::init_bare($dir);
        my $fi_data = './t/git.fast-import-data';
-       ok(-r $fi_data, "fast-import data readable (or run test at top level)");
-       local $ENV{GIT_DIR} = $dir;
-       system("git fast-import --quiet <$fi_data");
+       open my $fh, '<', $fi_data or die
+               "fast-import data readable (or run test at top level: $!";
+       my $rdr = { 0 => $fh };
+       xsys([qw(git fast-import --quiet)], { GIT_DIR => $dir }, $rdr);
        is($?, 0, 'fast-import succeeded');
 }
 
@@ -33,21 +35,38 @@ use_ok 'PublicInbox::Git';
 
        is(${$gcf->cat_file($f)}, $$raw, 'not broken after failures');
        is(${$gcf->cat_file($f)}, $$raw, 'not broken after partial read');
+
+       my $oid = $x[0];
+       my $arg = { 'foo' => 'bar' };
+       my $res = [];
+       my $missing = [];
+       $gcf->cat_async_begin;
+       $gcf->cat_async($oid, sub {
+               my ($bref, $oid_hex, $type, $size, $arg) = @_;
+               $res = [ @_ ];
+       }, $arg);
+       $gcf->cat_async('non-existent', sub {
+               my ($bref, $oid_hex, $type, $size, $arg) = @_;
+               $missing = [ @_ ];
+       }, $arg);
+       $gcf->cat_async_wait;
+       my ($bref, $oid_hex, $type, $size, $arg_res) = @$res;
+       is_deeply([$oid_hex, $type, $size], \@x, 'got expected header');
+       is($arg_res, $arg, 'arg passed to cat_async');
+       is_deeply($raw, $bref, 'blob result matches');
+       is_deeply($missing, [ undef, undef, undef, undef, $arg],
+               'non-existent blob gives expected result');
 }
 
 if (1) {
-       my $cmd = [ 'git', "--git-dir=$dir", qw(hash-object -w --stdin) ];
-
        # need a big file, use the AGPL-3.0 :p
        my $big_data = './COPYING';
        ok(-r $big_data, 'COPYING readable');
        my $size = -s $big_data;
        ok($size > 8192, 'file is big enough');
-
-       my $buf = do {
-               local $ENV{GIT_DIR} = $dir;
-               `git hash-object -w --stdin <$big_data`;
-       };
+       open my $fh, '<', $big_data or die;
+       my $cmd = [ 'git', "--git-dir=$dir", qw(hash-object -w --stdin) ];
+       my $buf = xqx($cmd, { GIT_DIR => $dir }, { 0 => $fh });
        is(0, $?, 'hashed object successfully');
        chomp $buf;
 
@@ -67,11 +86,11 @@ if (1) {
 }
 
 if ('alternates reloaded') {
-       my $alt = tempdir('pi-git-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+       my ($alt, $alt_obj) = tmpdir();
        my @cmd = ('git', "--git-dir=$alt", qw(hash-object -w --stdin));
-       is(system(qw(git init -q --bare), $alt), 0, 'create alt directory');
+       PublicInbox::Import::init_bare($alt);
        open my $fh, '<', "$alt/config" or die "open failed: $!\n";
-       my $rd = popen_rd(\@cmd, {}, { 0 => fileno($fh) } );
+       my $rd = popen_rd(\@cmd, {}, { 0 => $fh } );
        close $fh or die "close failed: $!";
        chomp(my $remote = <$rd>);
        my $gcf = PublicInbox::Git->new($dir);