X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fgit.t;h=d8957e422fd31083815fa46f6df9dfd166fc0d5b;hb=e28f33dc1b6e6a296946c0c58b43900c6cbd07f7;hp=2a189eac6c40835fa62a81024bed194fdebc48ac;hpb=13a2fcc724576a78d0955f64dc0f4494545153c3;p=public-inbox.git
diff --git a/t/git.t b/t/git.t
index 2a189eac..d8957e42 100644
--- a/t/git.t
+++ b/t/git.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2021 all contributors
+# Copyright (C) all contributors
# License: AGPL-3.0+
use strict;
use Test::More;
@@ -6,11 +6,10 @@ 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 +18,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 +44,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');
@@ -68,6 +73,30 @@ use_ok 'PublicInbox::Git';
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) {