X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fgit.t;h=8224969d0661fb7d6707a39ae779613ca38cf5b1;hb=daab9cf0b8fcd66d1cb7f62f7ea9a8b0e32320ef;hp=913f6e5e8928850e8f4c0ce1c2830db4200e0127;hpb=f44196a157cc8d806b142230d4ecf5f2687c0352;p=public-inbox.git

diff --git a/t/git.t b/t/git.t
index 913f6e5e..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');
 }
 
@@ -33,34 +31,29 @@ use_ok 'PublicInbox::Git';
 	my $raw = $gcf->cat_file($f);
 	is($x[2], length($$raw), 'length matches');
 
-	{
-		my $size;
-		my $rv = $gcf->cat_file($f, sub {
-			my ($in, $left) = @_;
-			$size = $$left;
-			'nothing'
-		});
-		is($rv, 'nothing', 'returned from callback without reading');
-		is($size, $x[2], 'set size for callback correctly');
-	}
-
-	eval { $gcf->cat_file($f, sub { die 'OMG' }) };
-	like($@, qr/\bOMG\b/, 'died in callback propagated');
 	is(${$gcf->cat_file($f)}, $$raw, 'not broken after failures');
-
-	{
-		my ($buf, $r);
-		my $rv = $gcf->cat_file($f, sub {
-			my ($in, $left) = @_;
-			$r = read($in, $buf, 2);
-			$$left -= $r;
-			'blah'
-		});
-		is($r, 2, 'only read 2 bytes');
-		is($buf, '--', 'partial read succeeded');
-		is($rv, 'blah', 'return value propagated');
-	}
 	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) {
@@ -72,51 +65,21 @@ 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;
 
 	my $gcf = PublicInbox::Git->new($dir);
 	my $rsize;
-	is($gcf->cat_file($buf, sub {
-		$rsize = ${$_[1]};
-		'x';
-	}), 'x', 'checked input');
-	is($rsize, $size, 'got correct size on big file');
-
 	my $x = $gcf->cat_file($buf, \$rsize);
 	is($rsize, $size, 'got correct size ref on big file');
 	is(length($$x), $size, 'read correct number of bytes');
 
-	my $rline;
-	$gcf->cat_file($buf, sub {
-		my ($in, $left) = @_;
-		$rline = <$in>;
-		$$left -= length($rline);
-	});
-	{
-		open my $fh, '<', $big_data or die "open failed: $!\n";
-		is($rline, <$fh>, 'first line matches');
-	};
-
-	my $all;
-	$gcf->cat_file($buf, sub {
-		my ($in, $left) = @_;
-		my $x = read($in, $all, $$left);
-		$$left -= $x;
-	});
-	{
-		open my $fh, '<', $big_data or die "open failed: $!\n";
-		local $/;
-		is($all, <$fh>, 'entire read matches');
-	};
-
 	my $ref = $gcf->qx(qw(cat-file blob), $buf);
-	is($all, $ref, 'qx read giant single string');
-
 	my @ref = $gcf->qx(qw(cat-file blob), $buf);
-	is($all, join('', @ref), 'qx returned array when wanted');
 	my $nl = scalar @ref;
 	ok($nl > 1, "qx returned array length of $nl");
 
@@ -125,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);