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

diff --git a/t/git.t b/t/git.t
index 844e0111..dfa5eab2 100644
--- a/t/git.t
+++ b/t/git.t
@@ -1,16 +1,16 @@
-# Copyright (C) 2015-2021 all contributors <meta@public-inbox.org>
+#!perl -w
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
-use Test::More;
+use v5.10.1;
 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);
+	PublicInbox::Import::init_bare($dir, 'master');
 	my $fi_data = './t/git.fast-import-data';
 	open my $fh, '<', $fi_data or die
 		"fast-import data readable (or run test at top level: $!";
@@ -19,7 +19,13 @@ use_ok 'PublicInbox::Git';
 	is($?, 0, 'fast-import succeeded');
 }
 {
-	my $git = PublicInbox::Git->new($dir);
+	my $git = PublicInbox::Git->new("$dir/foo.git");
+	my $nick = $git->local_nick; # internal sub
+	unlike($nick, qr/\.git\.git\z/, "no doubled `.git.git' suffix");
+	like($nick, qr/\.git\z/, "one `.git' suffix");
+	$git = PublicInbox::Git->new($dir);
+	$nick = $git->local_nick; # internal sub
+	like($nick, qr/\.git\z/, "local nick always adds `.git' suffix");
 	my @s = $git->date_parse('1970-01-01T00:00:00Z');
 	is($s[0], 0, 'parsed epoch');
 	local $ENV{TZ} = 'UTC';
@@ -39,7 +45,7 @@ use_ok 'PublicInbox::Git';
 	my $f = 'HEAD:foo.txt';
 	my @x = $gcf->check($f);
 	is(scalar @x, 3, 'returned 3 element array for existing file');
-	like($x[0], qr/\A[a-f0-9]{40}\z/, 'returns obj ID in 1st element');
+	like($x[0], qr/\A[a-f0-9]{40,64}\z/, 'returns obj ID in 1st element');
 	is('blob', $x[1], 'returns obj type in 2nd element');
 	like($x[2], qr/\A\d+\z/, 'returns obj size in 3rd element');
 
@@ -61,13 +67,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) {
@@ -105,7 +135,7 @@ if (1) {
 }
 
 SKIP: {
-	require_git(2.6, 7) or skip('need git 2.6+ for --batch-all-objects', 7);
+	require_git(2.6, 7);
 	my ($alt, $alt_obj) = tmpdir();
 	my $hash_obj = [ 'git', "--git-dir=$alt", qw(hash-object -w --stdin) ];
 	PublicInbox::Import::init_bare($alt);
@@ -147,7 +177,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');