X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fgit.t;h=fa541f41179fad34a033309ed25e51570cfd0f78;hb=1f461aead59a7fd92a1a262b962dd3c3d6bc1ef6;hp=844e0111f367fe10e6a037126ac9f0e7be1bd2f4;hpb=7a74224cc53d94cb690107593c586dd4c1897417;p=public-inbox.git

diff --git a/t/git.t b/t/git.t
index 844e0111..fa541f41 100644
--- a/t/git.t
+++ b/t/git.t
@@ -6,8 +6,7 @@ use PublicInbox::TestCommon;
 my ($dir, $for_destroy) = tmpdir();
 use PublicInbox::Import;
 use POSIX qw(strftime);
-
-use_ok 'PublicInbox::Git';
+use PublicInbox::Git;
 
 {
 	PublicInbox::Import::init_bare($dir);
@@ -61,13 +60,37 @@ use_ok 'PublicInbox::Git';
 		my ($bref, $oid_hex, $type, $size, $arg) = @_;
 		$missing = [ @_ ];
 	}, $arg);
-	$gcf->cat_async_wait;
+	$gcf->async_wait_all;
 	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, 'non-existent', 'missing', undef, $arg],
 		'non-existent blob gives expected result');
+
+	$res = [];
+	$gcf->cat_async($oid, sub { push @$res, \@_ });
+	$gcf->cat_async($oid, sub { die 'HI' });
+	$gcf->cat_async($oid, sub { push @$res, \@_ });
+	eval { $gcf->async_wait_all };
+	like($@, qr/\bHI\b/, 'die in callback propagates');
+	is(scalar(@$res), 2, 'two results');
+	is_deeply($res->[0], [ $raw, @x, undef ], '1st cb result');
+	is_deeply($res->[1], [ undef, $oid, undef, undef, undef ],
+		'2nd cb aborted ');
+
+	my @w;
+	local $PublicInbox::Git::async_warn = 1;
+	local $SIG{__WARN__} = sub { push @w, @_ };
+	$res = [];
+	$gcf->cat_async($oid, sub { push @$res, \@_ });
+	$gcf->cat_async($oid, sub { die 'HI' });
+	$gcf->cat_async($oid, sub { push @$res, \@_ });
+	eval { $gcf->async_wait_all };
+	is(scalar(@$res), 2, 'two results');
+	is_deeply($res->[0], [ $raw, @x, undef ], '1st cb result');
+	is_deeply($res->[1], [ $raw, @x, undef ], '2st cb result');
+	like("@w", qr/\bHI\b/, 'die turned to warning');
 }
 
 if (1) {
@@ -147,7 +170,7 @@ SKIP: {
 		# trigger cat_async_retry:
 		$gcf->cat_async($remote, $cb, $results);
 	}
-	$gcf->cat_async_wait;
+	$gcf->async_wait_all;
 	my $expect = [ @exist[0..3], [ $remote, 'blob', 5 ], @exist[4..5] ];
 	is_deeply($results, $expect, 'got expected results');