X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fgit.t;h=8224969d0661fb7d6707a39ae779613ca38cf5b1;hb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;hp=9bc8900c6d858781dcc23072f4d5a6af50ec07fd;hpb=3c30532aed6256a984c535530c6667552c2e6a84;p=public-inbox.git

diff --git a/t/git.t b/t/git.t
index 9bc8900c..8224969d 100644
--- a/t/git.t
+++ b/t/git.t
@@ -1,22 +1,20 @@
-# Copyright (C) 2015-2018 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);
 
-eval { require IPC::Run } or plan skip_all => 'IPC::Run missing';
 use_ok 'PublicInbox::Git';
 
 {
 	is(system(qw(git init -q --bare), $dir), 0, 'created git directory');
-	my $cmd = [ 'git', "--git-dir=$dir", 'fast-import', '--quiet' ];
-
 	my $fi_data = './t/git.fast-import-data';
 	ok(-r $fi_data, "fast-import data readable (or run test at top level)");
-	IPC::Run::run($cmd, '<', $fi_data);
+	local $ENV{GIT_DIR} = $dir;
+	system("git fast-import --quiet <$fi_data");
 	is($?, 0, 'fast-import succeeded');
 }
 
@@ -35,6 +33,27 @@ 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) {
@@ -46,8 +65,10 @@ if (1) {
 	my $size = -s $big_data;
 	ok($size > 8192, 'file is big enough');
 
-	my $buf = '';
-	IPC::Run::run($cmd, '<', $big_data, '>', \$buf);
+	my $buf = do {
+		local $ENV{GIT_DIR} = $dir;
+		`git hash-object -w --stdin <$big_data`;
+	};
 	is(0, $?, 'hashed object successfully');
 	chomp $buf;
 
@@ -67,11 +88,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');
 	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);