X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fgit.t;h=d8957e422fd31083815fa46f6df9dfd166fc0d5b;hb=5d6724a6a024f1c8ac96a485c1682be28373dc50;hp=7b950d88f4cc5c83f26393183b8918ce452ea34d;hpb=9e9ab7447b219bad3f764dfc646d8d7e9d7c39f4;p=public-inbox.git
diff --git a/t/git.t b/t/git.t
index 7b950d88..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,15 +18,23 @@ use_ok 'PublicInbox::Git';
is($?, 0, 'fast-import succeeded');
}
{
- my $git = PublicInbox::Git->new($dir);
- my $s = $git->date_parse('1970-01-01T00:00:00Z');
- is($s, 0, 'parsed epoch');
+ 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';
- $s = $git->date_parse('1993-10-02 01:02:09');
- is(strftime('%Y-%m-%dT%H:%M:%SZ', gmtime($s)), '1993-10-02T01:02:09Z',
- 'round trips');
- $s = $git->date_parse('1993-10-02');
- is(strftime('%Y-%m-%d', gmtime($s)), '1993-10-02',
+ @s = $git->date_parse('1993-10-02 01:02:09', '2010-10-02 01:03:04');
+ is(strftime('%Y-%m-%dT%H:%M:%SZ', gmtime($s[0])),
+ '1993-10-02T01:02:09Z', 'round trips');
+ is(strftime('%Y-%m-%dT%H:%M:%SZ', gmtime($s[1])),
+ '2010-10-02T01:03:04Z', '2nd arg round trips');
+ @s = $git->date_parse('1993-10-02');
+ is(strftime('%Y-%m-%d', gmtime($s[0])), '1993-10-02',
'round trips date-only');
}
@@ -37,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');
@@ -59,13 +66,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) {
@@ -96,8 +127,10 @@ if (1) {
$gcf->qx(qw(repack -adq));
ok($gcf->packed_bytes > 0, 'packed size is positive');
- $gcf->qx(qw(rev-parse --verify bogus));
- isnt($?, 0, '$? set on failure'.$?);
+ my $rdr;
+ open $rdr->{2}, '+>', '/dev/null' or xbail "open $!";
+ $gcf->qx([qw(rev-parse --verify bogus)], undef, $rdr);
+ isnt($?, 0, '$? set on failure: '.$?);
}
SKIP: {
@@ -143,7 +176,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');
@@ -166,5 +199,7 @@ is(git_quote($s = "Eléanor"), '"El\\303\\251anor"', 'quoted octal');
is(git_quote($s = "hello\"world"), '"hello\"world"', 'quoted dq');
is(git_quote($s = "hello\\world"), '"hello\\\\world"', 'quoted backslash');
is(git_quote($s = "hello\nworld"), '"hello\\nworld"', 'quoted LF');
+is(git_quote($s = "hello\x06world"), '"hello\\006world"', 'quoted \\x06');
+is(git_unquote($s = '"hello\\006world"'), "hello\x06world", 'unquoted \\x06');
done_testing();