v2writable: move git->cleanup to the correct place

[public-inbox.git] / t / solver_git.t

diff --git a/t/solver_git.t b/t/solver_git.t
index fe322eab00310417a6fed0a244146691d29b88b6..baab40a49a3d72bd85b029786dedb140fbfeb6d3 100644 (file)
--- a/t/solver_git.t
+++ b/t/solver_git.t
@@ -16,13 +16,15 @@ foreach my $mod (@mods) {
 }
 chomp(my $git_dir = `git rev-parse --git-dir 2>/dev/null`);
 plan skip_all => "$0 must be run from a git working tree" if $?;
+
+# needed for alternates, and --absolute-git-dir is only in git 2.13+
 $git_dir = abs_path($git_dir);
 
 use_ok "PublicInbox::$_" for (qw(Inbox V2Writable MIME Git SolverGit));
 
-my $mainrepo = tempdir('pi-solver-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my $inboxdir = tempdir('pi-solver-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 my $opts = {
-       mainrepo => $mainrepo,
+       inboxdir => $inboxdir,
        name => 'test-v2writable',
        version => 2,
        -primary_address => 'test@example.com',
@@ -40,10 +42,19 @@ sub deliver_patch ($) {
 
 deliver_patch('t/solve/0001-simple-mod.patch');
 
-my $gits = [ PublicInbox::Git->new($git_dir) ];
-my $solver = PublicInbox::SolverGit->new($gits, [ $ibx ]);
-open my $log, '+>>', "$mainrepo/solve.log" or die "open: $!";
-my $res = $solver->solve($log, '69df7d5', {});
+my $git = PublicInbox::Git->new($git_dir);
+is('public-inbox 1.0.0',
+       $git->commit_title('cb7c42b1e15577ed2215356a2bf925aef59cdd8d'),
+       'commit_title works on 1.0.0');
+
+is(undef, $git->commit_title('impossible'), 'undef on impossible object');
+
+$ibx->{-repo_objs} = [ $git ];
+my $res;
+my $solver = PublicInbox::SolverGit->new($ibx, sub { $res = $_[0] });
+open my $log, '+>>', "$inboxdir/solve.log" or die "open: $!";
+my $psgi_env = { 'psgi.errors' => *STDERR };
+$solver->solve($psgi_env, $log, '69df7d5', {});
 ok($res, 'solved a blob!');
 my $wt_git = $res->[0];
 is(ref($wt_git), 'PublicInbox::Git', 'got a git object for the blob');
@@ -62,20 +73,33 @@ if (0) { # TODO: check this?
        diag $z;
 }
 
+my $oid = $expect;
+for my $i (1..2) {
+       my $more;
+       my $s = PublicInbox::SolverGit->new($ibx, sub { $more = $_[0] });
+       $s->solve($psgi_env, $log, $oid, {});
+       is($more->[1], $expect, 'resolved blob to long OID '.$i);
+       chop($oid);
+}
+
+$solver = undef;
 $res = undef;
 my $wt_git_dir = $wt_git->{git_dir};
 $wt_git = undef;
 ok(!-d $wt_git_dir, 'no references to WT held');
 
-$res = $solver->solve($log, '0'x40, {});
+$solver = PublicInbox::SolverGit->new($ibx, sub { $res = $_[0] });
+$solver->solve($psgi_env, $log, '0'x40, {});
 is($res, undef, 'no error on z40');
 
 my $git_v2_20_1_tag = '7a95a1cd084cb665c5c2586a415e42df0213af74';
-$res = $solver->solve($log, $git_v2_20_1_tag, {});
+$solver = PublicInbox::SolverGit->new($ibx, sub { $res = $_[0] });
+$solver->solve($psgi_env, $log, $git_v2_20_1_tag, {});
 is($res, undef, 'no error on a tag not in our repo');
 
 deliver_patch('t/solve/0002-rename-with-modifications.patch');
-$res = $solver->solve($log, '0a92431', {});
+$solver = PublicInbox::SolverGit->new($ibx, sub { $res = $_[0] });
+$solver->solve($psgi_env, $log, '0a92431', {});
 ok($res, 'resolved without hints');
 
 my $hints = {
@@ -83,7 +107,9 @@ my $hints = {
        path_a => 'HACKING',
        path_b => 'CONTRIBUTING'
 };
-my $hinted = $solver->solve($log, '0a92431', $hints);
+$solver = PublicInbox::SolverGit->new($ibx, sub { $res = $_[0] });
+$solver->solve($psgi_env, $log, '0a92431', $hints);
+my $hinted = $res;
 # don't compare ::Git objects:
 shift @$res; shift @$hinted;
 is_deeply($res, $hinted, 'hints work (or did not hurt :P');