diff options
Diffstat (limited to 't')
| -rw-r--r-- | t/gcf2.t | 34 | ||||
| -rw-r--r-- | t/gcf2_client.t | 54 |
2 files changed, 65 insertions, 23 deletions
@@ -76,43 +76,41 @@ SKIP: { } open my $fh, '+>', undef or BAIL_OUT "open: $!"; - my $fd = fileno($fh); $fh->autoflush(1); - $gcf2->cat_oid($fd, 'invalid'); + ok(!$gcf2->cat_oid(fileno($fh), 'invalid'), 'invalid fails'); seek($fh, 0, SEEK_SET) or BAIL_OUT "seek: $!"; - is(do { local $/; <$fh> }, "invalid missing\n", 'got missing message'); + is(do { local $/; <$fh> }, '', 'nothing written'); + open $fh, '+>', undef or BAIL_OUT "open: $!"; + ok(!$gcf2->cat_oid(fileno($fh), '0'x40), 'z40 fails'); seek($fh, 0, SEEK_SET) or BAIL_OUT "seek: $!"; - $gcf2->cat_oid($fd, '0'x40); - seek($fh, 0, SEEK_SET) or BAIL_OUT "seek: $!"; - is(do { local $/; <$fh> }, ('0'x40)." missing\n", - 'got missing message for 0x40'); + is(do { local $/; <$fh> }, '', 'nothing written for z40'); - seek($fh, 0, SEEK_SET) or BAIL_OUT "seek: $!"; - $gcf2->cat_oid($fd, $COPYING); - my $buf; + open $fh, '+>', undef or BAIL_OUT "open: $!"; my $ck_copying = sub { my ($desc) = @_; seek($fh, 0, SEEK_SET) or BAIL_OUT "seek: $!"; - is(<$fh>, "$COPYING blob 34520\n", 'got expected header'); - $buf = do { local $/; <$fh> }; + is(<$fh>, "$COPYING blob 34520\n", "got expected header $desc"); + my $buf = do { local $/; <$fh> }; is(chop($buf), "\n", 'got trailing \\n'); is($buf, $agpl, "AGPL matches ($desc)"); }; + ok($gcf2->cat_oid(fileno($fh), $COPYING), 'cat_oid normal'); $ck_copying->('regular file'); $gcf2 = PublicInbox::Gcf2::new(); $gcf2->add_alternate("$tmpdir/objects"); - $ck_copying->('alternates respected'); + open $fh, '+>', undef or BAIL_OUT "open: $!"; + ok($gcf2->cat_oid(fileno($fh), $COPYING), 'cat_oid alternate'); + $ck_copying->('alternates after reopen'); - $^O eq 'linux' or skip('pipe tests are Linux-only', 12); - my $size = -s $fh; + $^O eq 'linux' or skip('pipe tests are Linux-only', 14); for my $blk (1, 0) { my ($r, $w); pipe($r, $w) or BAIL_OUT $!; fcntl($w, 1031, 4096) or - skip('Linux too old for F_SETPIPE_SZ', 12); + skip('Linux too old for F_SETPIPE_SZ', 14); $w->blocking($blk); seek($fh, 0, SEEK_SET) or BAIL_OUT "seek: $!"; truncate($fh, 0) or BAIL_OUT "truncate: $!"; @@ -120,11 +118,11 @@ SKIP: { if ($pid == 0) { close $w; tick; # wait for parent to block on writev - $buf = do { local $/; <$r> }; + my $buf = do { local $/; <$r> }; print $fh $buf or _exit(1); _exit(0); } - $gcf2->cat_oid(fileno($w), $COPYING); + ok($gcf2->cat_oid(fileno($w), $COPYING), "cat blocking=$blk"); close $w or BAIL_OUT "close: $!"; is(waitpid($pid, 0), $pid, 'child exited'); is($?, 0, 'no error in child'); diff --git a/t/gcf2_client.t b/t/gcf2_client.t index 39f9f296..0f7e7203 100644 --- a/t/gcf2_client.t +++ b/t/gcf2_client.t @@ -10,19 +10,25 @@ use PublicInbox::Import; require_mods('PublicInbox::Gcf2'); use_ok 'PublicInbox::Gcf2Client'; my ($tmpdir, $for_destroy) = tmpdir(); -PublicInbox::Import::init_bare($tmpdir); +my $git_a = "$tmpdir/a.git"; +my $git_b = "$tmpdir/b.git"; +PublicInbox::Import::init_bare($git_a); +PublicInbox::Import::init_bare($git_b); my $fi_data = './t/git.fast-import-data'; my $rdr = {}; open $rdr->{0}, '<', $fi_data or BAIL_OUT $!; -xsys([qw(git fast-import --quiet)], { GIT_DIR => $tmpdir }, $rdr); +xsys([qw(git fast-import --quiet)], { GIT_DIR => $git_a }, $rdr); is($?, 0, 'fast-import succeeded'); my $tree = 'fdbc43725f21f485051c17463b50185f4c3cf88c'; my $called = 0; +my $err_f = "$tmpdir/err"; { local $ENV{PATH} = getcwd()."/blib/script:$ENV{PATH}"; - my $gcf2c = PublicInbox::Gcf2Client->new; - $gcf2c->add_git_dir($tmpdir); + open my $err, '>', $err_f or BAIL_OUT $!; + my $gcf2c = PublicInbox::Gcf2Client::new({ 2 => $err }); + $gcf2c->add_git_dir($git_a); + $gcf2c->cat_async($tree, sub { my ($bref, $oid, $type, $size, $arg) = @_; is($oid, $tree, 'got expected OID'); @@ -32,6 +38,12 @@ my $called = 0; is($arg, 'hi', 'arg passed'); $called++; }, 'hi'); + $gcf2c->cat_async_wait; + + open $err, '<', $err_f or BAIL_OUT $!; + my $estr = do { local $/; <$err> }; + is($estr, '', 'nothing in stderr'); + my $trunc = substr($tree, 0, 39); $gcf2c->cat_async($trunc, sub { my ($bref, $oid, $type, $size, $arg) = @_; @@ -42,6 +54,38 @@ my $called = 0; is($arg, 'bye', 'arg passed when missing'); $called++; }, 'bye'); + $gcf2c->cat_async_wait; + + open $err, '<', $err_f or BAIL_OUT $!; + $estr = do { local $/; <$err> }; + like($estr, qr/retrying/, 'warned about retry'); + + # try failed alternates lookup + open $err, '>', $err_f or BAIL_OUT $!; + $gcf2c = PublicInbox::Gcf2Client::new({ 2 => $err }); + $gcf2c->add_git_dir($git_b); + $gcf2c->cat_async($tree, sub { + my ($bref, $oid, $type, $size, $arg) = @_; + is(undef, $bref, 'missing bref from alt is undef'); + $called++; + }); + $gcf2c->cat_async_wait; + open $err, '<', $err_f or BAIL_OUT $!; + $estr = do { local $/; <$err> }; + like($estr, qr/retrying/, 'warned about retry before alt update'); + + # now try successful alternates lookup + open my $alt, '>>', "$git_b/objects/info/alternates" or BAIL_OUT $!; + print $alt "$git_a/objects\n" or BAIL_OUT $!; + close $alt or BAIL_OUT; + my $expect = xqx(['git', "--git-dir=$git_a", qw(cat-file tree), $tree]); + $gcf2c->cat_async($tree, sub { + my ($bref, $oid, $type, $size, $arg) = @_; + is($oid, $tree, 'oid match on alternates retry'); + is($$bref, $expect, 'tree content matched'); + $called++; + }); + $gcf2c->cat_async_wait; } -is($called, 2, 'cat_async callbacks hit'); +is($called, 4, 'cat_async callbacks hit'); done_testing; |